evolve: hgext3rd/evolve/__init_

annotate hgext3rd/evolve/init.py @ 2923:8c2d3c474fc6

doc: make paragraphs before example code end with "::" for reST syntax This prevents lines in an example code from being treated as a part of normal paragraph. For issue example, lines are folded into one paragraph.

author	FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date	Mon, 07 Aug 2017 23:24:57 +0900
parents	e4ee0b6170e9
children	9efedcedd9dd

rev	line source
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1 # Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	2 # Logilab SA <contact@logilab.fr>
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	3 # Pierre-Yves David <pierre-yves.david@ens-lyon.org>
519 9825c7da5b54 ensure all file have a copyright notice Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 517 diff changeset	4 # Patrick Mezard <patrick@mezard.eu>
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	5 #
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	6 # This software may be used and distributed according to the terms of the
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	7 # GNU General Public License version 2 or any later version.
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	8 """extends Mercurial feature related to Changeset Evolution
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	9
2292 f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	10 This extension:
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	11
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	12 - provides several commands to mutate history and deal with resulting issues,
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	13 - enable the changeset-evolution feature for Mercurial,
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	14 - improves some aspect of the early implementation in Mercurial core,
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	15
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	16 Note that a version dedicated to server usage only (no local working copy) is
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	17 available as 'evolve.serveronly'.
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	18
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	19 While many feature related to changeset evolution are directly handled by core
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	20 this extensions contains significant additions recommended to any user of
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	21 changeset evolution.
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	22
2678 da2b3e5e4f69 docs: some fixes to the help text Pulkit Goyal <7895pulkit@gmail.com> parents: 2667 diff changeset	23 With the extension various evolution events will display warning (new unstable
2292 f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	24 changesets, obsolete working copy parent, improved error when accessing hidden
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	25 revision, etc).
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	26
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	27 In addition, the extension contains better discovery protocol for obsolescence
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	28 markers. This means less obs-markers will have to be pushed and pulled around,
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	29 speeding up such operation.
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	30
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	31 Some improvement and bug fixes available in newer version of Mercurial are also
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	32 backported to older version of Mercurial by this extension. Some older
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	33 experimental protocol are also supported for a longer time in the extensions to
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	34 help people transitioning. (The extensions is currently compatible down to
f026e85bd0b2 evolve: update extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2290 diff changeset	35 Mercurial version 3.8).
2311 26d638e419df auto-push: move config help in the extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2294 diff changeset	36
2923 8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2895 diff changeset	37 New Config::
2311 26d638e419df auto-push: move config help in the extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2294 diff changeset	38
26d638e419df auto-push: move config help in the extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2294 diff changeset	39 [experimental]
26d638e419df auto-push: move config help in the extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2294 diff changeset	40 # Set to control the behavior when pushing draft changesets to a publishing
26d638e419df auto-push: move config help in the extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2294 diff changeset	41 # repository. Possible value:
26d638e419df auto-push: move config help in the extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2294 diff changeset	42 # * ignore: current core behavior (default)
26d638e419df auto-push: move config help in the extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2294 diff changeset	43 # * warn: proceed with the push, but issue a warning
26d638e419df auto-push: move config help in the extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2294 diff changeset	44 # * abort: abort the push
26d638e419df auto-push: move config help in the extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2294 diff changeset	45 auto-publish = ignore
26d638e419df auto-push: move config help in the extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2294 diff changeset	46
2521 29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2504 diff changeset	47 # For some large repository with few markers, the current for obsolescence
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2504 diff changeset	48 # markers discovery can get in the way. You can disable it with the
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2504 diff changeset	49 # configuration option below. This means all pushes and pulls will
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2504 diff changeset	50 # re-exchange all markers every time.
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2504 diff changeset	51 evolution.obsdiscovery = yes
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2504 diff changeset	52
2460 64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	53 Obsolescence Markers Discovery Experiment
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	54 =========================================
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	55
2550 d8a48234efad obshashrange: basic proof reading of the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2549 diff changeset	56 We are experimenting with a new protocol to discover common markers between
d8a48234efad obshashrange: basic proof reading of the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2549 diff changeset	57 local and remote repositories. This experiment is still at an early stage but
d8a48234efad obshashrange: basic proof reading of the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2549 diff changeset	58 is already raising better results than the previous version (when usable).
d8a48234efad obshashrange: basic proof reading of the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2549 diff changeset	59
d8a48234efad obshashrange: basic proof reading of the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2549 diff changeset	60 "Large" repositories (hundreds of thousand) are currently unsupported. Some key
2460 64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	61 algorithm has a naive implementation with too agressive caching, creating
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	62 memory consumption issue (this will get fixed).
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	63
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	64 Medium sized repositories works fine, but be prepared for a noticable initial
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	65 cache filling. for the Mercurial repository, this is around 20 seconds
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	66
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	67 The following config control the experiment::
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	68
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	69 [experimental]
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	70
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	71 # enable new discovery protocol
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	72 # (needed on both client and server)
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	73 obshashrange = yes
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	74
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	75 # avoid cache warming after transaction
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	76 # (recommended 'off' for developer repositories)
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	77 # (recommended 'yes' for server (default))
64cc0b059073 obshashrange: document the experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2443 diff changeset	78 obshashrange.warm-cache = no
2475 84982b441e82 documentation: recomment using blackbox with the obshashrange experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2465 diff changeset	79
2715 61e73c8fe169 obshashrange: add cache warming instruction to the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2714 diff changeset	80 The initial cache warming is currently a bit slow. To make sure it is build you
61e73c8fe169 obshashrange: add cache warming instruction to the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2714 diff changeset	81 can run the following commands in your repository::
61e73c8fe169 obshashrange: add cache warming instruction to the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2714 diff changeset	82
61e73c8fe169 obshashrange: add cache warming instruction to the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2714 diff changeset	83 $ hg debugobshashrange --rev 'head()
61e73c8fe169 obshashrange: add cache warming instruction to the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2714 diff changeset	84
2678 da2b3e5e4f69 docs: some fixes to the help text Pulkit Goyal <7895pulkit@gmail.com> parents: 2667 diff changeset	85 It is recommended to enable the blackbox extension. It gathers useful data about
2687 4a02781d90ce evolve: fix documentation formatting Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2678 diff changeset	86 the experiment. It is shipped with Mercurial so no extra install is needed::
2475 84982b441e82 documentation: recomment using blackbox with the obshashrange experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2465 diff changeset	87
84982b441e82 documentation: recomment using blackbox with the obshashrange experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2465 diff changeset	88 [extensions]
84982b441e82 documentation: recomment using blackbox with the obshashrange experiment Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2465 diff changeset	89 blackbox =
2493 3ee8e9a12f41 doc: add documentation about effectflag experiment Boris Feld <boris.feld@octobus.net> parents: 2488 diff changeset	90
2550 d8a48234efad obshashrange: basic proof reading of the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2549 diff changeset	91 Finally some extra options are available to help tame the experimental
2687 4a02781d90ce evolve: fix documentation formatting Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2678 diff changeset	92 implementation of some of the algorithms::
2504 d95006fe4dd0 stablerange: use last recently used caching for revisions associated to ranges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2493 diff changeset	93
d95006fe4dd0 stablerange: use last recently used caching for revisions associated to ranges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2493 diff changeset	94 [experimental]
d95006fe4dd0 stablerange: use last recently used caching for revisions associated to ranges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2493 diff changeset	95 # restrict cache size to reduce memory consumption
d95006fe4dd0 stablerange: use last recently used caching for revisions associated to ranges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2493 diff changeset	96 obshashrange.lru-size = 2000 # default is 2000
d95006fe4dd0 stablerange: use last recently used caching for revisions associated to ranges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2493 diff changeset	97
2551 ecd47c63b6de obshashrange: add an option to protect from accidental activation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2550 diff changeset	98 # automatically disable obshashrange related computation and capabilities
ecd47c63b6de obshashrange: add an option to protect from accidental activation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2550 diff changeset	99 # if the repository has more than N revisions. This is meant to help large
ecd47c63b6de obshashrange: add an option to protect from accidental activation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2550 diff changeset	100 # server deployement to enable the feature on smaller repositories while
ecd47c63b6de obshashrange: add an option to protect from accidental activation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2550 diff changeset	101 # ensuring no large repository will get affected.
ecd47c63b6de obshashrange: add an option to protect from accidental activation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2550 diff changeset	102 obshashrange.max-revs = 100000 # default is None
ecd47c63b6de obshashrange: add an option to protect from accidental activation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2550 diff changeset	103
2714 7eff426f999b evolve: explain how to disable markers discovery in the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2699 diff changeset	104 For very large repositories. it is currently recommended to disable obsmarkers
7eff426f999b evolve: explain how to disable markers discovery in the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2699 diff changeset	105 discovery (Make sure you follow release announcement to know when you can turn
2923 8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2895 diff changeset	106 it back on)::
2714 7eff426f999b evolve: explain how to disable markers discovery in the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2699 diff changeset	107
7eff426f999b evolve: explain how to disable markers discovery in the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2699 diff changeset	108 [experimental]
7eff426f999b evolve: explain how to disable markers discovery in the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2699 diff changeset	109 evolution.obsdiscovery = no
7eff426f999b evolve: explain how to disable markers discovery in the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2699 diff changeset	110
2493 3ee8e9a12f41 doc: add documentation about effectflag experiment Boris Feld <boris.feld@octobus.net> parents: 2488 diff changeset	111 Effect Flag Experiment
3ee8e9a12f41 doc: add documentation about effectflag experiment Boris Feld <boris.feld@octobus.net> parents: 2488 diff changeset	112 ======================
3ee8e9a12f41 doc: add documentation about effectflag experiment Boris Feld <boris.feld@octobus.net> parents: 2488 diff changeset	113
2689 9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	114 Evolve also records what changed between two evolutions of a changeset. For
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	115 example, having this information is helpful to understand what changed between
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	116 an obsolete changeset and its tipmost successors.
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	117
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	118 Evolve currently records:
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	119
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	120 - Meta changes, user, date
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	121 - Tree movement, branch and parent, did the changeset moved?
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	122 - Description, was the commit description edited
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	123 - Diff, was there apart from potential diff change due to rebase a change in the diff?
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	124
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	125 These flags are lightweight and can be combined, so it's easy to see if 4
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	126 evolutions of the same changeset has just updated the description or if the
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	127 content changed and you need to review again the diff.
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	128
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	129 The effect flag recording is enabled by default in Evolve 6.4.0 so you have
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	130 nothing to do to enjoy it. Now every new evolution that you create will have
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	131 the effect flag attached.
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	132
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	133 The following config control the effect flag recording::
2493 3ee8e9a12f41 doc: add documentation about effectflag experiment Boris Feld <boris.feld@octobus.net> parents: 2488 diff changeset	134
3ee8e9a12f41 doc: add documentation about effectflag experiment Boris Feld <boris.feld@octobus.net> parents: 2488 diff changeset	135 [experimental]
2689 9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	136 # uncomment to deactivate the registration of effect flags in obs markers
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	137 # evolution.effect-flags = false
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	138
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	139 You can display the effect flags with the command obslog, so if you have a
2923 8c2d3c474fc6 doc: make paragraphs before example code end with "::" for reST syntax FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 2895 diff changeset	140 changeset and you update only the message, you will see::
2689 9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	141
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	142 $ hg commit -m "WIP
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	143 $ hg commit -m "A better commit message!"
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	144 $ hg obslog .
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	145 @ 8e9045855628 (3133) A better commit message!
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	146 \|
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	147 x 7863a5bb5763 (3132) WIP
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	148 rewritten(description) by Boris Feld <boris.feld@octobus.net> (Fri Jun 02 12:00:24 2017 +0200) as 8e9045855628
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	149
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	150 Servers does not need to activate the effect flag recording. Effect flags that
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	151 you create will not cause interference with other clients or servers without
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	152 the effect flag recording.
2556 d5b97b5dec5b doc: document the evolve templates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2551 diff changeset	153
d5b97b5dec5b doc: document the evolve templates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2551 diff changeset	154 Templates
d5b97b5dec5b doc: document the evolve templates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2551 diff changeset	155 =========
d5b97b5dec5b doc: document the evolve templates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2551 diff changeset	156
d5b97b5dec5b doc: document the evolve templates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2551 diff changeset	157 Evolve ship several templates that you can use to have a better visibility
d5b97b5dec5b doc: document the evolve templates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2551 diff changeset	158 about your obs history:
d5b97b5dec5b doc: document the evolve templates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2551 diff changeset	159
d5b97b5dec5b doc: document the evolve templates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2551 diff changeset	160 - precursors, for each obsolete changeset show the closest visible
d5b97b5dec5b doc: document the evolve templates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2551 diff changeset	161 precursors.
2678 da2b3e5e4f69 docs: some fixes to the help text Pulkit Goyal <7895pulkit@gmail.com> parents: 2667 diff changeset	162 - successors, for each obsolete changeset show the closests visible
2556 d5b97b5dec5b doc: document the evolve templates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2551 diff changeset	163 successors. It is useful when your working directory is obsolete to see
2678 da2b3e5e4f69 docs: some fixes to the help text Pulkit Goyal <7895pulkit@gmail.com> parents: 2667 diff changeset	164 what are its successors. This information can also be retrieved with the
2556 d5b97b5dec5b doc: document the evolve templates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2551 diff changeset	165 obslog command and the --all option.
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	166 - obsfate, for each obsolete changeset display a line summarizing what
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	167 changed between the changeset and its successors. Dependending on the
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	168 verbosity level (-q and -v) it display the changeset successors, the users
2678 da2b3e5e4f69 docs: some fixes to the help text Pulkit Goyal <7895pulkit@gmail.com> parents: 2667 diff changeset	169 that created the obsmarkers and the date range of these changes.
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	170
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	171 The template itself is not complex, the data are basically a list of
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	172 successortset. Each successorset is a dict with these fields:
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	173
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	174 - "verb", how did the revision changed, pruned or rewritten for the moment
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	175 - "users" a sorted list of users that have create obs marker between current
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	176 changeset and one of its successor
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	177 - "min_date" the tiniest date of the first obs marker between current
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	178 changeset and one of its successor
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	179 - "max_date" the biggest date between current changeset and one of its
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	180 successor
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	181 - "successors" a sorted list of locally know successors node ids
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	182 - "markers" the raw list of changesets.
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	183 """
2049 b81d3775006b evolve: move extension metadata in their own module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2048 diff changeset	184
1414 4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	185 evolutionhelptext = """
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	186 Obsolescence markers make it possible to mark changesets that have been
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	187 deleted or superset in a new version of the changeset.
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	188
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	189 Unlike the previous way of handling such changes, by stripping the old
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	190 changesets from the repository, obsolescence markers can be propagated
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	191 between repositories. This allows for a safe and simple way of exchanging
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	192 mutable history and altering it after the fact. Changeset phases are
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	193 respected, such that only draft and secret changesets can be altered (see
1709 989ed2f30d41 help: fix evolution hg phases reference timeless@gmail.com parents: 1702 diff changeset	194 :hg:`help phases` for details).
1414 4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	195
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	196 Obsolescence is tracked using "obsolete markers", a piece of metadata
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	197 tracking which changesets have been made obsolete, potential successors for
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	198 a given changeset, the moment the changeset was marked as obsolete, and the
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	199 user who performed the rewriting operation. The markers are stored
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	200 separately from standard changeset data can be exchanged without any of the
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	201 precursor changesets, preventing unnecessary exchange of obsolescence data.
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	202
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	203 The complete set of obsolescence markers describes a history of changeset
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	204 modifications that is orthogonal to the repository history of file
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	205 modifications. This changeset history allows for detection and automatic
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	206 resolution of edge cases arising from multiple users rewriting the same part
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	207 of history concurrently.
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	208
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	209 Current feature status
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	210 ======================
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	211
1710 aec233d3cafd help: fix evolution help grammar timeless@gmail.com parents: 1709 diff changeset	212 This feature is still in development. If you see this help, you have enabled an
1414 4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	213 extension that turned this feature on.
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	214
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	215 Obsolescence markers will be exchanged between repositories that explicitly
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	216 assert support for the obsolescence feature (this can currently only be done
2782 2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	217 via an extension).
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	218
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	219 Instability
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	220 ==========
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	221
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	222 (note: the vocabulary is in the process of being updated)
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	223
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	224 Rewriting changesets might introduce instability (currently 'trouble').
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	225
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	226 There are two main kinds of instability: orphaning and diverging.
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	227
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	228 Orphans are changesets left behind when their ancestors are rewritten, (currently: 'unstable').
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	229 Divergence has two variants:
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	230
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	231 * Content-divergence occurs when independent rewrites of the same changesets
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	232 lead to different results. (currently: 'divergent')
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	233
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	234 * Phase-divergence occurs when the old (obsolete) version of a changeset
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	235 becomes public. (currently: 'bumped')
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	236
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	237 If it possible to prevent local creation of orphans by using the following config::
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	238
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	239 [experimental]
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	240 evolution=createmarkers,allnewcommands,exchange
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	241
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	242 You can also enable that option explicitly::
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	243
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	244 [experimental]
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	245 evolution=createmarkers,allnewcommands,allowunstable,exchange
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	246
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	247 or simply::
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	248
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	249 [experimental]
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	250 evolution=all
2bd0b0996cfb evolve: document the various instability/troubles Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2772 diff changeset	251 """.strip()
1414 4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	252
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	253
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	254 import os
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	255 import sys
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	256 import re
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	257 import collections
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	258 import errno
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	259 import struct
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	260
1676 1247d87a738d py3: tolerate io/StringIO divergence timeless@gmail.com parents: 1675 diff changeset	261 try:
1247d87a738d py3: tolerate io/StringIO divergence timeless@gmail.com parents: 1675 diff changeset	262 import StringIO as io
1247d87a738d py3: tolerate io/StringIO divergence timeless@gmail.com parents: 1675 diff changeset	263 StringIO = io.StringIO
1247d87a738d py3: tolerate io/StringIO divergence timeless@gmail.com parents: 1675 diff changeset	264 except ImportError:
1247d87a738d py3: tolerate io/StringIO divergence timeless@gmail.com parents: 1675 diff changeset	265 import io
1247d87a738d py3: tolerate io/StringIO divergence timeless@gmail.com parents: 1675 diff changeset	266 StringIO = io.StringIO
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	267
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	268
1825 377d94d6c889 evolve: proactively detect bad version early Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1824 diff changeset	269 try:
377d94d6c889 evolve: proactively detect bad version early Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1824 diff changeset	270 from mercurial import registrar
377d94d6c889 evolve: proactively detect bad version early Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1824 diff changeset	271 registrar.templatekeyword # new in hg-3.8
377d94d6c889 evolve: proactively detect bad version early Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1824 diff changeset	272 except ImportError:
2049 b81d3775006b evolve: move extension metadata in their own module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2048 diff changeset	273 from . import metadata
2895 e4ee0b6170e9 compat: make it more clear that evolve need Mercurial >= minversion Philippe Pepiot <phil@philpep.org> parents: 2859 diff changeset	274 raise ImportError('evolve needs Mercurial version %s or above' %
2049 b81d3775006b evolve: move extension metadata in their own module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2048 diff changeset	275 min(metadata.testedwith.split()))
1825 377d94d6c889 evolve: proactively detect bad version early Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1824 diff changeset	276
670 97ce1f801309 evolve: drop unused import Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 663 diff changeset	277 import mercurial
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	278 from mercurial import util
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	279
1834 f23a97d14895 compat: drop compat for older wireproto implementation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1833 diff changeset	280 from mercurial import obsolete
f23a97d14895 compat: drop compat for older wireproto implementation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1833 diff changeset	281 if not obsolete._enabled:
f23a97d14895 compat: drop compat for older wireproto implementation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1833 diff changeset	282 obsolete._enabled = True
617 469befc27b26 detect incompatibility with future mercurial 2.5 Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 616 diff changeset	283
1823 649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	284 from mercurial import (
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	285 bookmarks as bookmarksmod,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	286 cmdutil,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	287 commands,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	288 context,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	289 copies,
2465 479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	290 dirstate,
1823 649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	291 error,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	292 extensions,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	293 help,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	294 hg,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	295 lock as lockmod,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	296 merge,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	297 node,
2524 d912380ec685 evolve: fix import order Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2521 diff changeset	298 obsolete,
1823 649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	299 patch,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	300 phases,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	301 revset,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	302 scmutil,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	303 )
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	304
2762 610581a2fb74 commands: move split to the 'evocommands' module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2761 diff changeset	305 from mercurial.commands import mergetoolopts
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	306 from mercurial.i18n import _
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	307 from mercurial.node import nullid
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	308
2041 3b6550261614 exthelper: extract into its own submodule Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2032 diff changeset	309 from . import (
2245 a14e05e4bb20 checkheads: import our own copy of the checkheads code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2123 diff changeset	310 checkheads,
2525 5adb8bdb935e compatibility: backport mercurial 176d1a0ce385 Boris Feld <boris.feld@octobus.net> parents: 2524 diff changeset	311 compat,
2123 cf7b4ab31f0c split: move the debugcommand into a dedicated module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2122 diff changeset	312 debugcmd,
2772 394b836e475b commands: rewrite the 'evocommands' module to 'cmdrewrite' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2766 diff changeset	313 cmdrewrite,
2041 3b6550261614 exthelper: extract into its own submodule Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2032 diff changeset	314 exthelper,
2049 b81d3775006b evolve: move extension metadata in their own module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2048 diff changeset	315 metadata,
2294 75996eafab43 perf: adds some cache key helper on the obsstore class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2293 diff changeset	316 obscache,
75996eafab43 perf: adds some cache key helper on the obsstore class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2293 diff changeset	317 obsexchange,
2524 d912380ec685 evolve: fix import order Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2521 diff changeset	318 obshistory,
2756 f4dd6e6d4c73 rewriteutil: create a rewriteutil module to host utility function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2755 diff changeset	319 rewriteutil,
2286 a4c5744a7b93 safeguard: add an option to disable automatic publishing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2275 diff changeset	320 safeguard,
2524 d912380ec685 evolve: fix import order Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2521 diff changeset	321 templatekw,
2047 ce39d0f9976d serveronly: give the sub extension a way to access to the 'evolve' module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2044 diff changeset	322 utility,
2041 3b6550261614 exthelper: extract into its own submodule Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2032 diff changeset	323 )
3b6550261614 exthelper: extract into its own submodule Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2032 diff changeset	324
2049 b81d3775006b evolve: move extension metadata in their own module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2048 diff changeset	325 __version__ = metadata.__version__
b81d3775006b evolve: move extension metadata in their own module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2048 diff changeset	326 testedwith = metadata.testedwith
b81d3775006b evolve: move extension metadata in their own module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2048 diff changeset	327 minimumhgversion = metadata.minimumhgversion
b81d3775006b evolve: move extension metadata in their own module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2048 diff changeset	328 buglink = metadata.buglink
1838 6942750831bb serveronly: deduplicate code with the main evolve extension Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1836 diff changeset	329
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	330 sha1re = re.compile(r'\b[0-9a-f]{6,40}\b')
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	331
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	332 # Flags for enabling optional parts of evolve
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	333 commandopt = 'allnewcommands'
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	334
2047 ce39d0f9976d serveronly: give the sub extension a way to access to the 'evolve' module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2044 diff changeset	335 obsexcmsg = utility.obsexcmsg
2763 4a5b0c373e65 commands: move the touch to the 'evocommands' module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2762 diff changeset	336 shorttemplate = utility.shorttemplate
1838 6942750831bb serveronly: deduplicate code with the main evolve extension Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1836 diff changeset	337
2404 c07f752137f4 label: rename 'evolve.short_node' to 'evolve.node' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2403 diff changeset	338 colortable = {'evolve.node': 'yellow',
2337 c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	339 'evolve.user': 'green',
c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	340 'evolve.rev': 'blue',
c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	341 'evolve.short_description': '',
c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	342 'evolve.date': 'cyan',
c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	343 'evolve.current_rev': 'bold',
c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	344 'evolve.verb': '',
c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	345 }
c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	346
820 a9a66143e2ec exchange: actually use _pushkeyescape fallback Pierre-Yves David <pierre-yves.david@fb.com> parents: 819 diff changeset	347 _pack = struct.pack
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	348 _unpack = struct.unpack
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	349
1296 23819e1d61fd evolve: add -i flag to amend command Laurent Charignon <lcharignon@fb.com> parents: 1281 diff changeset	350 aliases, entry = cmdutil.findcmd('commit', commands.table)
2772 394b836e475b commands: rewrite the 'evocommands' module to 'cmdrewrite' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2766 diff changeset	351 commitopts3 = cmdrewrite.commitopts3
394b836e475b commands: rewrite the 'evocommands' module to 'cmdrewrite' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2766 diff changeset	352 interactiveopt = cmdrewrite.interactiveopt
2756 f4dd6e6d4c73 rewriteutil: create a rewriteutil module to host utility function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2755 diff changeset	353 _bookmarksupdater = rewriteutil.bookmarksupdater
2759 3137185b1bfe rewriteutil: move the 'rewrite' function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2758 diff changeset	354 rewrite = rewriteutil.rewrite
2724 e6bc6eaa17c5 amend: extract into a 'evolve.evocommands' module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2716 diff changeset	355
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	356 # This extension contains the following code
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	357 #
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	358 # - Extension Helper code
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	359 # - Obsolescence cache
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	360 # - ...
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	361 # - Older format compat
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	362
2041 3b6550261614 exthelper: extract into its own submodule Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2032 diff changeset	363 eh = exthelper.exthelper()
2123 cf7b4ab31f0c split: move the debugcommand into a dedicated module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2122 diff changeset	364 eh.merge(debugcmd.eh)
2053 f3765c4a352a exchange: rename the module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2051 diff changeset	365 eh.merge(obsexchange.eh)
2245 a14e05e4bb20 checkheads: import our own copy of the checkheads code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2123 diff changeset	366 eh.merge(checkheads.eh)
2286 a4c5744a7b93 safeguard: add an option to disable automatic publishing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2275 diff changeset	367 eh.merge(safeguard.eh)
2294 75996eafab43 perf: adds some cache key helper on the obsstore class Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2293 diff changeset	368 eh.merge(obscache.eh)
2415 89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2414 diff changeset	369 eh.merge(obshistory.eh)
2485 e6ecd35e99ec refactor: extract templates into a new file Boris Feld <boris.feld@octobus.net> parents: 2481 diff changeset	370 eh.merge(templatekw.eh)
2525 5adb8bdb935e compatibility: backport mercurial 176d1a0ce385 Boris Feld <boris.feld@octobus.net> parents: 2524 diff changeset	371 eh.merge(compat.eh)
2772 394b836e475b commands: rewrite the 'evocommands' module to 'cmdrewrite' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2766 diff changeset	372 eh.merge(cmdrewrite.eh)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	373 uisetup = eh.final_uisetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	374 extsetup = eh.final_extsetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	375 reposetup = eh.final_reposetup
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	376 cmdtable = eh.cmdtable
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	377
2465 479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	378 # pre hg 4.0 compat
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	379
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	380 if not util.safehasattr(dirstate.dirstate, 'parentchange'):
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	381 import contextlib
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	382
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	383 @contextlib.contextmanager
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	384 def parentchange(self):
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	385 '''Context manager for handling dirstate parents.
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	386
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	387 If an exception occurs in the scope of the context manager,
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	388 the incoherent dirstate won't be written when wlock is
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	389 released.
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	390 '''
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	391 self._parentwriters += 1
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	392 yield
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	393 # Typically we want the "undo" step of a context manager in a
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	394 # finally block so it happens even when an exception
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	395 # occurs. In this case, however, we only want to decrement
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	396 # parentwriters if the code in the with statement exits
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	397 # normally, so we don't have a try/finally here on purpose.
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	398 self._parentwriters -= 1
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	399 dirstate.dirstate.parentchange = parentchange
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	400
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	401 #####################################################################
1213 7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	402 ### Option configuration ###
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	403 #####################################################################
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	404
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	405 @eh.reposetup # must be the first of its kin.
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	406 def _configureoptions(ui, repo):
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	407 # If no capabilities are specified, enable everything.
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	408 # This is so existing evolve users don't need to change their config.
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	409 evolveopts = ui.configlist('experimental', 'evolution')
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	410 if not evolveopts:
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	411 evolveopts = ['all']
1635 91ba7e0daff6 alias: report evolve as origin for aliases timeless@gmail.com parents: 1634 diff changeset	412 ui.setconfig('experimental', 'evolution', evolveopts, 'evolve')
1213 7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	413
1226 901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	414 @eh.uisetup
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	415 def _configurecmdoptions(ui):
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	416 # Unregister evolve commands if the command capability is not specified.
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	417 #
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	418 # This must be in the same function as the option configuration above to
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	419 # guarantee it happens after the above configuration, but before the
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	420 # extsetup functions.
1441 a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	421 evolvecommands = ui.configlist('experimental', 'evolutioncommands')
1226 901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	422 evolveopts = ui.configlist('experimental', 'evolution')
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	423 if evolveopts and (commandopt not in evolveopts and
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	424 'all' not in evolveopts):
1441 a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	425 # We build whitelist containing the commands we want to enable
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	426 whitelist = set()
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	427 for cmd in evolvecommands:
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	428 matchingevolvecommands = [e for e in cmdtable.keys() if cmd in e]
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	429 if not matchingevolvecommands:
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	430 raise error.Abort(_('unknown command: %s') % cmd)
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	431 elif len(matchingevolvecommands) > 1:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	432 msg = _('ambiguous command specification: "%s" matches %r')
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	433 raise error.Abort(msg % (cmd, matchingevolvecommands))
1441 a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	434 else:
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	435 whitelist.add(matchingevolvecommands[0])
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	436 for disabledcmd in set(cmdtable) - whitelist:
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	437 del cmdtable[disabledcmd]
1213 7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	438
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	439 #####################################################################
805 66c02a2e8e2f prune: wrap mercurial internal to add parent information in prune marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 804 diff changeset	440 ### experimental behavior ###
66c02a2e8e2f prune: wrap mercurial internal to add parent information in prune marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 804 diff changeset	441 #####################################################################
66c02a2e8e2f prune: wrap mercurial internal to add parent information in prune marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 804 diff changeset	442
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	443 getrevs = obsolete.getrevs
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	444
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	445 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	446 ### Additional Utilities ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	447 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	448
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	449 # This section contains a lot of small utility function and method
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	450
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	451 # - Function to create markers
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	452 # - useful alias pstatus and pdiff (should probably go in evolve)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	453 # - "troubles" method on changectx
1661 48232457b704 Spelling: through timeless@gmail.com parents: 1659 diff changeset	454 # - function to travel through the obsolescence graph
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	455 # - function to find useful changeset to stabilize
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	456
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	457
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	458 ### Useful alias
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	459
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	460 @eh.uisetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	461 def _installalias(ui):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	462 if ui.config('alias', 'pstatus', None) is None:
1635 91ba7e0daff6 alias: report evolve as origin for aliases timeless@gmail.com parents: 1634 diff changeset	463 ui.setconfig('alias', 'pstatus', 'status --rev .^', 'evolve')
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	464 if ui.config('alias', 'pdiff', None) is None:
1635 91ba7e0daff6 alias: report evolve as origin for aliases timeless@gmail.com parents: 1634 diff changeset	465 ui.setconfig('alias', 'pdiff', 'diff --rev .^', 'evolve')
497 43e1b2cab789 evolve: add the odiff alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	466 if ui.config('alias', 'odiff', None) is None:
949 2b2a4ab0eb68 evolve: make most line lenghts 80 characters or less Angel Ezquerra <angel.ezquerra@gmail.com> parents: 948 diff changeset	467 ui.setconfig('alias', 'odiff',
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	468 "diff --hidden --rev 'limit(precursors(.),1)' --rev .",
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	469 'evolve')
696 121e2d265e85 alias: add a grab alias Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 695 diff changeset	470 if ui.config('alias', 'grab', None) is None:
1104 cb36a4eb0157 evolve: fix the 'grab' alias to work on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1101 diff changeset	471 if os.name == 'nt':
2658 ae822f28b617 grab: properly quote hg executable in the alias Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2591 diff changeset	472 hgexe = ('"%s"' % util.hgexecutable())
ae822f28b617 grab: properly quote hg executable in the alias Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2591 diff changeset	473 ui.setconfig('alias', 'grab', "! " + hgexe
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	474 + " rebase --dest . --rev $@ && "
2658 ae822f28b617 grab: properly quote hg executable in the alias Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2591 diff changeset	475 + hgexe + " up tip",
1635 91ba7e0daff6 alias: report evolve as origin for aliases timeless@gmail.com parents: 1634 diff changeset	476 'evolve')
1104 cb36a4eb0157 evolve: fix the 'grab' alias to work on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1101 diff changeset	477 else:
cb36a4eb0157 evolve: fix the 'grab' alias to work on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1101 diff changeset	478 ui.setconfig('alias', 'grab',
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	479 "! $HG rebase --dest . --rev $@ && $HG up tip",
1635 91ba7e0daff6 alias: report evolve as origin for aliases timeless@gmail.com parents: 1634 diff changeset	480 'evolve')
696 121e2d265e85 alias: add a grab alias Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 695 diff changeset	481
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	482
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	483 ### Troubled revset symbol
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	484
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	485 @eh.revset('troubled')
594 7f89b31fcb26 merge bumped rename Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 592 593 diff changeset	486 def revsettroubled(repo, subset, x):
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	487 """``troubled()``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	488 Changesets with troubles.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	489 """
993 8a4a8fe50c26 evolve: do not use _ as an unused variable Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 988 diff changeset	490 revset.getargs(x, 0, 0, 'troubled takes no arguments')
1381 61849d45d47e evolve: move 'troubled()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1380 diff changeset	491 troubled = set()
2845 9fc6a4615ae5 revset: unstable volatile set was deprecated Boris Feld <boris.feld@octobus.net> parents: 2844 diff changeset	492 troubled.update(getrevs(repo, 'orphan'))
2847 a1805a65ce21 revset: bumped volatile set was deprecated Boris Feld <boris.feld@octobus.net> parents: 2846 diff changeset	493 troubled.update(getrevs(repo, 'phasedivergent'))
2846 9c019996bce0 revset: divergent volatile set was deprecated Boris Feld <boris.feld@octobus.net> parents: 2845 diff changeset	494 troubled.update(getrevs(repo, 'contentdivergent'))
1381 61849d45d47e evolve: move 'troubled()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1380 diff changeset	495 troubled = revset.baseset(troubled)
61849d45d47e evolve: move 'troubled()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1380 diff changeset	496 troubled.sort() # set is non-ordered, enforce order
61849d45d47e evolve: move 'troubled()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1380 diff changeset	497 return subset & troubled
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	498
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	499 ### Obsolescence graph
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	500
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	501 # XXX SOME MAJOR CLEAN UP TO DO HERE XXX
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	502
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	503 def _precursors(repo, s):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	504 """Precursor of a changeset"""
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	505 cs = set()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	506 nm = repo.changelog.nodemap
2840 dfad30be866c context: precursors was deprecated Boris Feld <boris.feld@octobus.net> parents: 2838 diff changeset	507 markerbysubj = repo.obsstore.predecessors
1377 01bdeb847f81 evolve: avoid creating changectx object in _precursors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1376 diff changeset	508 node = repo.changelog.node
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	509 for r in s:
1377 01bdeb847f81 evolve: avoid creating changectx object in _precursors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1376 diff changeset	510 for p in markerbysubj.get(node(r), ()):
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	511 pr = nm.get(p[0])
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	512 if pr is not None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	513 cs.add(pr)
1383 cf62abb62941 evolve: move 'precursors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1382 diff changeset	514 cs -= repo.changelog.filteredrevs # nodemap has no filtering
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	515 return cs
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	516
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	517 def _allprecursors(repo, s): # XXX we need a better naming
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	518 """transitive precursors of a subset"""
1378 a127f0f3bf5f evolve: avoid creating changectx object in _allprecursors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1377 diff changeset	519 node = repo.changelog.node
a127f0f3bf5f evolve: avoid creating changectx object in _allprecursors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1377 diff changeset	520 toproceed = [node(r) for r in s]
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	521 seen = set()
2840 dfad30be866c context: precursors was deprecated Boris Feld <boris.feld@octobus.net> parents: 2838 diff changeset	522 allsubjects = repo.obsstore.predecessors
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	523 while toproceed:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	524 nc = toproceed.pop()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	525 for mark in allsubjects.get(nc, ()):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	526 np = mark[0]
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	527 if np not in seen:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	528 seen.add(np)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	529 toproceed.append(np)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	530 nm = repo.changelog.nodemap
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	531 cs = set()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	532 for p in seen:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	533 pr = nm.get(p)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	534 if pr is not None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	535 cs.add(pr)
1384 64c8b8c27811 evolve: move 'allprecursors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1383 diff changeset	536 cs -= repo.changelog.filteredrevs # nodemap has no filtering
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	537 return cs
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	538
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	539 def _successors(repo, s):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	540 """Successors of a changeset"""
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	541 cs = set()
1379 693cdcd809f2 evolve: avoid creating changectx object in _successors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1378 diff changeset	542 node = repo.changelog.node
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	543 nm = repo.changelog.nodemap
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	544 markerbyobj = repo.obsstore.successors
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	545 for r in s:
1379 693cdcd809f2 evolve: avoid creating changectx object in _successors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1378 diff changeset	546 for p in markerbyobj.get(node(r), ()):
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	547 for sub in p[1]:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	548 sr = nm.get(sub)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	549 if sr is not None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	550 cs.add(sr)
1385 c2584407afbf evolve: move 'successors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1384 diff changeset	551 cs -= repo.changelog.filteredrevs # nodemap has no filtering
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	552 return cs
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	553
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	554 def _allsuccessors(repo, s, haltonflags=0): # XXX we need a better naming
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	555 """transitive successors of a subset
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	556
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	557 haltonflags allows to provide flags which prevent the evaluation of a
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	558 marker. """
1380 43dcf62237be evolve: avoid creating changectx object in _allsuccessors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1379 diff changeset	559 node = repo.changelog.node
43dcf62237be evolve: avoid creating changectx object in _allsuccessors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1379 diff changeset	560 toproceed = [node(r) for r in s]
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	561 seen = set()
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	562 allobjects = repo.obsstore.successors
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	563 while toproceed:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	564 nc = toproceed.pop()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	565 for mark in allobjects.get(nc, ()):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	566 if mark[2] & haltonflags:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	567 continue
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	568 for sub in mark[1]:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	569 if sub == nullid:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	570 continue # should not be here!
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	571 if sub not in seen:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	572 seen.add(sub)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	573 toproceed.append(sub)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	574 nm = repo.changelog.nodemap
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	575 cs = set()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	576 for s in seen:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	577 sr = nm.get(s)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	578 if sr is not None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	579 cs.add(sr)
1386 b5eaec8a53d0 evolve: move 'allsuccessors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1385 diff changeset	580 cs -= repo.changelog.filteredrevs # nodemap has no filtering
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	581 return cs
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	582
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	583 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	584 ### Extending revset and template ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	585 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	586
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	587 # this section add several useful revset symbol not yet in core.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	588 # they are subject to changes
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	589
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	590
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	591 ### XXX I'm not sure this revset is useful
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	592 @eh.revset('suspended')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	593 def revsetsuspended(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	594 """``suspended()``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	595 Obsolete changesets with non-obsolete descendants.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	596 """
1307 677c5da57b9c evolve: remove unused variables Laurent Charignon <lcharignon@fb.com> parents: 1306 diff changeset	597 revset.getargs(x, 0, 0, 'suspended takes no arguments')
1382 c431f827f366 evolve: move 'suspended()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1381 diff changeset	598 suspended = revset.baseset(getrevs(repo, 'suspended'))
c431f827f366 evolve: move 'suspended()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1381 diff changeset	599 suspended.sort()
c431f827f366 evolve: move 'suspended()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1381 diff changeset	600 return subset & suspended
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	601
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	602
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	603 @eh.revset('precursors')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	604 def revsetprecursors(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	605 """``precursors(set)``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	606 Immediate precursors of changesets in set.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	607 """
1204 161b8f6e7402 evolve: use 3.2+ fullreposet to evaluate argument set (issue4515) Yuya Nishihara <yuya@tcha.org> parents: 1203 diff changeset	608 s = revset.getset(repo, revset.fullreposet(repo), x)
1383 cf62abb62941 evolve: move 'precursors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1382 diff changeset	609 s = revset.baseset(_precursors(repo, s))
cf62abb62941 evolve: move 'precursors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1382 diff changeset	610 s.sort()
cf62abb62941 evolve: move 'precursors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1382 diff changeset	611 return subset & s
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	612
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	613
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	614 @eh.revset('allprecursors')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	615 def revsetallprecursors(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	616 """``allprecursors(set)``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	617 Transitive precursors of changesets in set.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	618 """
1204 161b8f6e7402 evolve: use 3.2+ fullreposet to evaluate argument set (issue4515) Yuya Nishihara <yuya@tcha.org> parents: 1203 diff changeset	619 s = revset.getset(repo, revset.fullreposet(repo), x)
1384 64c8b8c27811 evolve: move 'allprecursors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1383 diff changeset	620 s = revset.baseset(_allprecursors(repo, s))
64c8b8c27811 evolve: move 'allprecursors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1383 diff changeset	621 s.sort()
64c8b8c27811 evolve: move 'allprecursors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1383 diff changeset	622 return subset & s
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	623
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	624
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	625 @eh.revset('successors')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	626 def revsetsuccessors(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	627 """``successors(set)``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	628 Immediate successors of changesets in set.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	629 """
1204 161b8f6e7402 evolve: use 3.2+ fullreposet to evaluate argument set (issue4515) Yuya Nishihara <yuya@tcha.org> parents: 1203 diff changeset	630 s = revset.getset(repo, revset.fullreposet(repo), x)
1385 c2584407afbf evolve: move 'successors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1384 diff changeset	631 s = revset.baseset(_successors(repo, s))
c2584407afbf evolve: move 'successors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1384 diff changeset	632 s.sort()
c2584407afbf evolve: move 'successors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1384 diff changeset	633 return subset & s
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	634
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	635 @eh.revset('allsuccessors')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	636 def revsetallsuccessors(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	637 """``allsuccessors(set)``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	638 Transitive successors of changesets in set.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	639 """
1204 161b8f6e7402 evolve: use 3.2+ fullreposet to evaluate argument set (issue4515) Yuya Nishihara <yuya@tcha.org> parents: 1203 diff changeset	640 s = revset.getset(repo, revset.fullreposet(repo), x)
1386 b5eaec8a53d0 evolve: move 'allsuccessors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1385 diff changeset	641 s = revset.baseset(_allsuccessors(repo, s))
b5eaec8a53d0 evolve: move 'allsuccessors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1385 diff changeset	642 s.sort()
b5eaec8a53d0 evolve: move 'allsuccessors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1385 diff changeset	643 return subset & s
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	644
1399 9ff6d9240f16 template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 949 diff changeset	645
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	646 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	647 ### Various trouble warning ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	648 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	649
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	650 # This section take care of issue warning to the user when troubles appear
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	651
1527 e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	652 def _warnobsoletewc(ui, repo):
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	653 rev = repo['.']
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	654
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	655 if not rev.obsolete():
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	656 return
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	657
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	658 msg = _("working directory parent is obsolete! (%s)\n")
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	659 shortnode = node.short(rev.node())
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	660
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	661 ui.warn(msg % shortnode)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	662
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	663 # Check that evolve is activated for performance reasons
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	664 if ui.quiet or not obsolete.isenabled(repo, commandopt):
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	665 return
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	666
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	667 # Show a warning for helping the user to solve the issue
2488 1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2485 diff changeset	668 reason, successors = obshistory._getobsfateandsuccs(repo, rev.node())
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	669
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	670 if reason == 'pruned':
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	671 solvemsg = _("use 'hg evolve' to update to its parent successor")
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	672 elif reason == 'diverged':
2835 20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	673 debugcommand = "hg evolve --list --contentdivergent"
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	674 basemsg = _("%s has diverged, use '%s' to resolve the issue")
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	675 solvemsg = basemsg % (shortnode, debugcommand)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	676 elif reason == 'superseed':
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	677 msg = _("use 'hg evolve' to update to its successor: %s")
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	678 solvemsg = msg % successors[0]
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	679 elif reason == 'superseed_split':
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	680 msg = _("use 'hg evolve' to update to its tipmost successor: %s")
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	681
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	682 if len(successors) <= 2:
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	683 solvemsg = msg % ", ".join(successors)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	684 else:
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	685 firstsuccessors = ", ".join(successors[:2])
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	686 remainingnumber = len(successors) - 2
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	687 successorsmsg = _("%s and %d more") % (firstsuccessors, remainingnumber)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	688 solvemsg = msg % successorsmsg
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	689 else:
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	690 raise ValueError(reason)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	691
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	692 ui.warn("(%s)\n" % solvemsg)
1527 e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	693
2293 1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	694 if util.safehasattr(context, '_filterederror'):
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	695 # if < hg-4.2 we do not update the message
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	696 @eh.wrapfunction(context, '_filterederror')
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	697 def evolve_filtererror(original, repo, changeid):
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	698 """build an exception to be raised about a filtered changeid
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	699
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	700 This is extracted in a function to help extensions (eg: evolve) to
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	701 experiment with various message variants."""
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	702 if repo.filtername.startswith('visible'):
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	703
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	704 unfilteredrepo = repo.unfiltered()
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	705 rev = unfilteredrepo[changeid]
2488 1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2485 diff changeset	706 reason, successors = obshistory._getobsfateandsuccs(unfilteredrepo, rev.node())
2293 1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	707
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	708 # Be more precise in cqse the revision is superseed
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	709 if reason == 'superseed':
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	710 reason = _("successor: %s") % successors[0]
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	711 elif reason == 'superseed_split':
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	712 if len(successors) <= 2:
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	713 reason = _("successors: %s") % ", ".join(successors)
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	714 else:
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	715 firstsuccessors = ", ".join(successors[:2])
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	716 remainingnumber = len(successors) - 2
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	717 successorsmsg = _("%s and %d more") % (firstsuccessors, remainingnumber)
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	718 reason = _("successors: %s") % successorsmsg
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	719
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	720 msg = _("hidden revision '%s'") % changeid
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	721 hint = _('use --hidden to access hidden revisions; %s') % reason
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	722 return error.FilteredRepoLookupError(msg, hint=hint)
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	723 msg = _("filtered revision '%s' (not in '%s' subset)")
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	724 msg %= (changeid, repo.filtername)
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	725 return error.FilteredRepoLookupError(msg)
1659b42c28c2 compat: only install the better filtered message for mercurial 4.2 and above Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2292 diff changeset	726
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	727 @eh.wrapcommand("update")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	728 @eh.wrapcommand("pull")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	729 def wrapmayobsoletewc(origfn, ui, repo, args, *opts):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	730 """Warn that the working directory parent is an obsolete changeset"""
1452 1bcbd14cf159 merge back with 3.3 compat branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	731 def warnobsolete():
1527 e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	732 _warnobsoletewc(ui, repo)
1452 1bcbd14cf159 merge back with 3.3 compat branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	733 wlock = None
1bcbd14cf159 merge back with 3.3 compat branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	734 try:
1bcbd14cf159 merge back with 3.3 compat branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	735 wlock = repo.wlock()
1bcbd14cf159 merge back with 3.3 compat branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	736 repo._afterlock(warnobsolete)
1bcbd14cf159 merge back with 3.3 compat branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	737 res = origfn(ui, repo, args, *opts)
1bcbd14cf159 merge back with 3.3 compat branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	738 finally:
1bcbd14cf159 merge back with 3.3 compat branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	739 lockmod.release(wlock)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	740 return res
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	741
1527 e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	742 @eh.wrapcommand("parents")
e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	743 def wrapparents(origfn, ui, repo, args, *opts):
e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	744 res = origfn(ui, repo, args, *opts)
e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	745 _warnobsoletewc(ui, repo)
e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	746 return res
e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	747
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	748 # XXX this could wrap transaction code
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	749 # XXX (but this is a bit a layer violation)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	750 @eh.wrapcommand("commit")
763 966e2659e989 import: warn about new unstable changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 762 diff changeset	751 @eh.wrapcommand("import")
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	752 @eh.wrapcommand("push")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	753 @eh.wrapcommand("pull")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	754 @eh.wrapcommand("graft")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	755 @eh.wrapcommand("phase")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	756 @eh.wrapcommand("unbundle")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	757 def warnobserrors(orig, ui, repo, args, *kwargs):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	758 """display warning is the command resulted in more instable changeset"""
658 2a2b8c95bb43 evolve: remove revset calls in warnobserror Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 657 diff changeset	759 # part of the troubled stuff may be filtered (stash ?)
2a2b8c95bb43 evolve: remove revset calls in warnobserror Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 657 diff changeset	760 # This needs a better implementation but will probably wait for core.
2a2b8c95bb43 evolve: remove revset calls in warnobserror Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 657 diff changeset	761 filtered = repo.changelog.filteredrevs
2845 9fc6a4615ae5 revset: unstable volatile set was deprecated Boris Feld <boris.feld@octobus.net> parents: 2844 diff changeset	762 priorunstables = len(set(getrevs(repo, 'orphan')) - filtered)
2847 a1805a65ce21 revset: bumped volatile set was deprecated Boris Feld <boris.feld@octobus.net> parents: 2846 diff changeset	763 priorbumpeds = len(set(getrevs(repo, 'phasedivergent')) - filtered)
2846 9c019996bce0 revset: divergent volatile set was deprecated Boris Feld <boris.feld@octobus.net> parents: 2845 diff changeset	764 priordivergents = len(set(getrevs(repo, 'contentdivergent')) - filtered)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	765 ret = orig(ui, repo, args, *kwargs)
658 2a2b8c95bb43 evolve: remove revset calls in warnobserror Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 657 diff changeset	766 filtered = repo.changelog.filteredrevs
949 2b2a4ab0eb68 evolve: make most line lenghts 80 characters or less Angel Ezquerra <angel.ezquerra@gmail.com> parents: 948 diff changeset	767 newunstables = \
2845 9fc6a4615ae5 revset: unstable volatile set was deprecated Boris Feld <boris.feld@octobus.net> parents: 2844 diff changeset	768 len(set(getrevs(repo, 'orphan')) - filtered) - priorunstables
949 2b2a4ab0eb68 evolve: make most line lenghts 80 characters or less Angel Ezquerra <angel.ezquerra@gmail.com> parents: 948 diff changeset	769 newbumpeds = \
2847 a1805a65ce21 revset: bumped volatile set was deprecated Boris Feld <boris.feld@octobus.net> parents: 2846 diff changeset	770 len(set(getrevs(repo, 'phasedivergent')) - filtered) - priorbumpeds
949 2b2a4ab0eb68 evolve: make most line lenghts 80 characters or less Angel Ezquerra <angel.ezquerra@gmail.com> parents: 948 diff changeset	771 newdivergents = \
2846 9c019996bce0 revset: divergent volatile set was deprecated Boris Feld <boris.feld@octobus.net> parents: 2845 diff changeset	772 len(set(getrevs(repo, 'contentdivergent')) - filtered) - priordivergents
2854 66796d7b5415 warning: rename unstable warning message Boris Feld <boris.feld@octobus.net> parents: 2847 diff changeset	773
66796d7b5415 warning: rename unstable warning message Boris Feld <boris.feld@octobus.net> parents: 2847 diff changeset	774 base_msg = _('%i new %s changesets\n')
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	775 if newunstables > 0:
2854 66796d7b5415 warning: rename unstable warning message Boris Feld <boris.feld@octobus.net> parents: 2847 diff changeset	776 ui.warn(base_msg % (newunstables, compat.TROUBLES['ORPHAN']))
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	777 if newbumpeds > 0:
2855 1db0137297f4 warning: rename bumped warning message Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	778 ui.warn(base_msg % (newbumpeds, compat.TROUBLES['PHASEDIVERGENT']))
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	779 if newdivergents > 0:
2857 0c286d054bcd warning: use 'divergent', not 'contentdivergent' on old Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 2856 diff changeset	780 ui.warn(base_msg % (newdivergents, compat.TROUBLES['CONTENTDIVERGENT']))
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	781 return ret
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	782
1122 c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	783 @eh.wrapfunction(mercurial.exchange, 'push')
c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	784 def push(orig, repo, args, *opts):
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	785 """Add a hint for "hg evolve" when troubles make push fails
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	786 """
1122 c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	787 try:
c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	788 return orig(repo, args, *opts)
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	789 except error.Abort as ex:
1122 c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	790 hint = _("use 'hg evolve' to get a stable history "
c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	791 "or --force to ignore warnings")
c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	792 if (len(ex.args) >= 1
c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	793 and ex.args[0].startswith('push includes ')
c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	794 and ex.hint is None):
c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	795 ex.hint = hint
c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	796 raise
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	797
788 e973dd5bf583 evolve: register a summary hook instead of wrapping the summary command Simon Heimberg <simohe@besonet.ch> parents: 776 diff changeset	798 def summaryhook(ui, repo):
513 4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	799 def write(fmt, count):
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	800 s = fmt % count
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	801 if count:
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	802 ui.write(s)
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	803 else:
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	804 ui.note(s)
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	805
1640 bbf897714e70 evolve: add --continue note to summary timeless@gmail.com parents: 1639 diff changeset	806 state = _evolvestateread(repo)
bbf897714e70 evolve: add --continue note to summary timeless@gmail.com parents: 1639 diff changeset	807 if state is not None:
bbf897714e70 evolve: add --continue note to summary timeless@gmail.com parents: 1639 diff changeset	808 # i18n: column positioning for "hg summary"
bbf897714e70 evolve: add --continue note to summary timeless@gmail.com parents: 1639 diff changeset	809 ui.write(_('evolve: (evolve --continue)\n'))
788 e973dd5bf583 evolve: register a summary hook instead of wrapping the summary command Simon Heimberg <simohe@besonet.ch> parents: 776 diff changeset	810
e973dd5bf583 evolve: register a summary hook instead of wrapping the summary command Simon Heimberg <simohe@besonet.ch> parents: 776 diff changeset	811 @eh.extsetup
e973dd5bf583 evolve: register a summary hook instead of wrapping the summary command Simon Heimberg <simohe@besonet.ch> parents: 776 diff changeset	812 def obssummarysetup(ui):
e973dd5bf583 evolve: register a summary hook instead of wrapping the summary command Simon Heimberg <simohe@besonet.ch> parents: 776 diff changeset	813 cmdutil.summaryhooks.add('evolve', summaryhook)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	814
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	815
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	816 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	817 ### Core Other extension compat ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	818 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	819
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	820
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	821 @eh.extsetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	822 def _rebasewrapping(ui):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	823 # warning about more obsolete
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	824 try:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	825 rebase = extensions.find('rebase')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	826 if rebase:
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	827 extensions.wrapcommand(rebase.cmdtable, 'rebase', warnobserrors)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	828 except KeyError:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	829 pass # rebase not found
678 718262019c6f evolve: warn for troubles created by histedit too. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 677 diff changeset	830 try:
718262019c6f evolve: warn for troubles created by histedit too. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 677 diff changeset	831 histedit = extensions.find('histedit')
718262019c6f evolve: warn for troubles created by histedit too. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 677 diff changeset	832 if histedit:
718262019c6f evolve: warn for troubles created by histedit too. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 677 diff changeset	833 extensions.wrapcommand(histedit.cmdtable, 'histedit', warnobserrors)
718262019c6f evolve: warn for troubles created by histedit too. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 677 diff changeset	834 except KeyError:
1575 0c8548df67fe merge with stable Pierre-Yves David <pierre-yves.david@fb.com> parents: 1568 1574 diff changeset	835 pass # histedit not found
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	836
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	837 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	838 ### Old Evolve extension content ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	839 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	840
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	841 # XXX need clean up and proper sorting in other section
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	842
82 8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	843 ### changeset rewriting logic
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	844 #############################
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	845
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	846 class MergeFailure(error.Abort):
463 3f91654713dd obsolete Move merge failure handling into stabilize code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 455 diff changeset	847 pass
3f91654713dd obsolete Move merge failure handling into stabilize code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 455 diff changeset	848
1576 526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	849 def relocate(repo, orig, dest, pctx=None, keepbranch=False):
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	850 """rewrite <rev> on dest"""
1021 200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	851 if orig.rev() == dest.rev():
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	852 raise error.Abort(_('tried to relocate a node on top of itself'),
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	853 hint=_("This shouldn't happen. If you still "
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	854 "need to move changesets, please do so "
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	855 "manually with nothing to rebase - working "
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	856 "directory parent is also destination"))
1021 200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	857
1576 526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	858 if pctx is None:
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	859 if len(orig.parents()) == 2:
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	860 raise error.Abort(_("tried to relocate a merge commit without "
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	861 "specifying which parent should be moved"),
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	862 hint=_("Specify the parent by passing in pctx"))
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	863 pctx = orig.p1()
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	864
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	865 commitmsg = orig.description()
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	866
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	867 cache = {}
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	868 sha1s = re.findall(sha1re, commitmsg)
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	869 unfi = repo.unfiltered()
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	870 for sha1 in sha1s:
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	871 ctx = None
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	872 try:
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	873 ctx = unfi[sha1]
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	874 except error.RepoLookupError:
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	875 continue
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	876
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	877 if not ctx.obsolete():
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	878 continue
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	879
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	880 successors = compat.successorssets(repo, ctx.node(), cache)
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	881
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	882 # We can't make any assumptions about how to update the hash if the
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	883 # cset in question was split or diverged.
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	884 if len(successors) == 1 and len(successors[0]) == 1:
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	885 newsha1 = node.hex(successors[0][0])
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	886 commitmsg = commitmsg.replace(sha1, newsha1[:len(sha1)])
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	887 else:
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	888 repo.ui.note(_('The stale commit message reference to %s could '
1145 fb51113a1c08 evolve: add the missing newline to output messages where needed Matt Harbison <matt_harbison@yahoo.com> parents: 1144 diff changeset	889 'not be updated\n') % sha1)
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	890
1593 2f117c299325 evolve: remove meaningless transaction nesting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 1592 diff changeset	891 tr = repo.currenttransaction()
2f117c299325 evolve: remove meaningless transaction nesting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 1592 diff changeset	892 assert tr is not None
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	893 try:
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	894 r = _evolvemerge(repo, orig, dest, pctx, keepbranch)
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	895 if r[-1]: # some conflict
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	896 raise error.Abort(_('unresolved merge conflicts '
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	897 '(see hg help resolve)'))
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	898 nodenew = _relocatecommit(repo, orig, commitmsg)
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	899 except error.Abort as exc:
2465 479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	900 with repo.dirstate.parentchange():
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	901 repo.setparents(repo['.'].node(), nullid)
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	902 repo.dirstate.write(tr)
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	903 # fix up dirstate for copies and renames
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	904 copies.duplicatecopies(repo, dest.rev(), orig.p1().rev())
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	905
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	906 class LocalMergeFailure(MergeFailure, exc.__class__):
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	907 pass
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	908 exc.__class__ = LocalMergeFailure
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	909 tr.close() # to keep changes in this transaction (e.g. dirstate)
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	910 raise
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	911 _finalizerelocate(repo, orig, dest, nodenew, tr)
1021 200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	912 return nodenew
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	913
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	914 ### new command
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	915 #############################
716 4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	916
953 a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	917 @eh.uisetup
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	918 def _installimportobsolete(ui):
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	919 entry = cmdutil.findcmd('import', commands.table)[1]
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	920 entry[1].append(('', 'obsolete', False,
1162 5c07f464981e help: fix typo in help for 'obsolete' option added to import command Mike Edgar <adgar@google.com> parents: 1160 diff changeset	921 _('mark the old node as obsoleted by '
953 a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	922 'the created commit')))
930 cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	923
953 a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	924 @eh.wrapfunction(mercurial.cmdutil, 'tryimportone')
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	925 def tryimportone(orig, ui, repo, hunk, parents, opts, args, *kwargs):
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	926 extracted = patch.extract(ui, hunk)
1830 53aae4b4e791 compat: drop compatibility layer for 'tryimportone' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1829 diff changeset	927 expected = extracted.get('nodeid')
1115 cc19b6400dae import: fix the "is None" check for the Node Pierre-Yves David <pierre-yves.david@fb.com> parents: 1109 diff changeset	928 if expected is not None:
1055 cfe1b9d3e5d9 import: handle patch with no node information Pierre-Yves David <pierre-yves.david@fb.com> parents: 1054 diff changeset	929 expected = node.bin(expected)
953 a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	930 oldextract = patch.extract
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	931 try:
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	932 patch.extract = lambda ui, hunk: extracted
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	933 ret = orig(ui, repo, hunk, parents, opts, args, *kwargs)
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	934 finally:
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	935 patch.extract = oldextract
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	936 created = ret[1]
1055 cfe1b9d3e5d9 import: handle patch with no node information Pierre-Yves David <pierre-yves.david@fb.com> parents: 1054 diff changeset	937 if (opts['obsolete'] and None not in (created, expected)
cfe1b9d3e5d9 import: handle patch with no node information Pierre-Yves David <pierre-yves.david@fb.com> parents: 1054 diff changeset	938 and created != expected):
953 a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	939 tr = repo.transaction('import-obs')
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	940 try:
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	941 metadata = {'user': ui.username()}
1054 93e920feff5e import: compare binary node with binary node when using --obsolete Pierre-Yves David <pierre-yves.david@fb.com> parents: 1052 diff changeset	942 repo.obsstore.create(tr, expected, (created,),
953 a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	943 metadata=metadata)
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	944 tr.close()
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	945 finally:
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	946 tr.release()
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	947 return ret
930 cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	948
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	949
894 4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	950 def _deprecatealias(oldalias, newalias):
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	951 '''Deprecates an alias for a command in favour of another
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	952
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	953 Creates a new entry in the command table for the old alias. It creates a
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	954 wrapper that has its synopsis set to show that is has been deprecated.
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	955 The documentation will be replace with a pointer to the new alias.
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	956 If a user invokes the command a deprecation warning will be printed and
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	957 the command of the new alias will be invoked.
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	958
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	959 This function is loosely based on the extensions.wrapcommand function.
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	960 '''
1226 901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	961 try:
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	962 aliases, entry = cmdutil.findcmd(newalias, cmdtable)
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	963 except error.UnknownCommand:
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	964 # Commands may be disabled
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	965 return
1678 7caa5f2040c5 py3: use items() instead of iteritems() timeless@gmail.com parents: 1677 diff changeset	966 for alias, e in cmdtable.items():
894 4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	967 if e is entry:
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	968 break
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	969
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	970 synopsis = '(DEPRECATED)'
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	971 if len(entry) > 2:
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	972 fn, opts, _syn = entry
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	973 else:
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	974 fn, opts, = entry
1496 62aa11956a40 evolve: _() should not contain % timeless@mozdev.org parents: 1495 diff changeset	975 deprecationwarning = _('%s have been deprecated in favor of %s\n') % (
62aa11956a40 evolve: _() should not contain % timeless@mozdev.org parents: 1495 diff changeset	976 oldalias, newalias)
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	977
894 4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	978 def newfn(args, *kwargs):
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	979 ui = args[0]
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	980 ui.warn(deprecationwarning)
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	981 util.checksignature(fn)(args, *kwargs)
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	982 newfn.__doc__ = deprecationwarning
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	983 cmdwrapper = eh.command(oldalias, opts, synopsis)
894 4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	984 cmdwrapper(newfn)
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	985
895 17ac69db9329 evolve: deprecate gup and gdown aliases Olle Lundberg <geek@nerd.sh> parents: 894 diff changeset	986 @eh.extsetup
17ac69db9329 evolve: deprecate gup and gdown aliases Olle Lundberg <geek@nerd.sh> parents: 894 diff changeset	987 def deprecatealiases(ui):
17ac69db9329 evolve: deprecate gup and gdown aliases Olle Lundberg <geek@nerd.sh> parents: 894 diff changeset	988 _deprecatealias('gup', 'next')
17ac69db9329 evolve: deprecate gup and gdown aliases Olle Lundberg <geek@nerd.sh> parents: 894 diff changeset	989 _deprecatealias('gdown', 'previous')
894 4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	990
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	991 def _solveone(ui, repo, ctx, dryrun, confirm, progresscb, category):
1320 b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	992 """Resolve the troubles affecting one revision"""
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	993 wlock = lock = tr = None
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	994 try:
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	995 wlock = repo.wlock()
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	996 lock = repo.lock()
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	997 tr = repo.transaction("evolve")
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	998 if 'orphan' == category:
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	999 result = _solveunstable(ui, repo, ctx, dryrun, confirm, progresscb)
2836 feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1000 elif 'phasedivergent' == category:
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1001 result = _solvebumped(ui, repo, ctx, dryrun, confirm, progresscb)
2835 20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1002 elif 'contentdivergent' == category:
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1003 result = _solvedivergent(ui, repo, ctx, dryrun, confirm,
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1004 progresscb)
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1005 else:
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1006 assert False, "unknown trouble category: %s" % (category)
1320 b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	1007 tr.close()
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	1008 return result
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	1009 finally:
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	1010 lockmod.release(tr, lock, wlock)
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	1011
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1012 def _handlenotrouble(ui, repo, allopt, revopt, anyopt, targetcat):
1327 7821a00fb6de evolve: rename handlenotrouble to _handlenotrouble and add doc Laurent Charignon <lcharignon@fb.com> parents: 1326 diff changeset	1013 """Used by the evolve function to display an error message when
7821a00fb6de evolve: rename handlenotrouble to _handlenotrouble and add doc Laurent Charignon <lcharignon@fb.com> parents: 1326 diff changeset	1014 no troubles can be resolved"""
2836 feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1015 troublecategories = ['phasedivergent', 'contentdivergent', 'orphan']
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1016 unselectedcategories = [c for c in troublecategories if c != targetcat]
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1017 msg = None
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1018 hint = None
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1019
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1020 troubled = {
2842 2b8b960a04ee revset: unstable() is deprecated Boris Feld <boris.feld@octobus.net> parents: 2840 diff changeset	1021 "orphan": repo.revs("orphan()"),
2843 f588de9dd067 revset: divergent() is deprecated Boris Feld <boris.feld@octobus.net> parents: 2842 diff changeset	1022 "contentdivergent": repo.revs("contentdivergent()"),
2844 9688988472da revset: bumped() is deprecated Boris Feld <boris.feld@octobus.net> parents: 2843 diff changeset	1023 "phasedivergent": repo.revs("phasedivergent()"),
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1024 "all": repo.revs("troubled()"),
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1025 }
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1026
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1027 hintmap = {
2836 feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1028 'phasedivergent': _("do you want to use --phasedivergent"),
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1029 'phasedivergent+contentdivergent': _("do you want to use "
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1030 "--phasedivergent or"
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1031 " --contentdivergent"),
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1032 'phasedivergent+orphan': _("do you want to use --phasedivergent"
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1033 " or --orphan"),
2835 20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1034 'contentdivergent': _("do you want to use --contentdivergent"),
20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1035 'contentdivergent+orphan': _("do you want to use --contentdivergent"
20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1036 " or --orphan"),
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1037 'orphan': _("do you want to use --orphan"),
2836 feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1038 'any+phasedivergent': _("do you want to use --any (or --rev) and"
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1039 " --phasedivergent"),
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1040 'any+phasedivergent+contentdivergent': _("do you want to use --any"
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1041 " (or --rev) and"
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1042 " --phasedivergent or"
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1043 " --contentdivergent"),
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1044 'any+phasedivergent+orphan': _("do you want to use --any (or --rev)"
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1045 " and --phasedivergent or --orphan"),
2835 20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1046 'any+contentdivergent': _("do you want to use --any (or --rev) and"
20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1047 " --contentdivergent"),
20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1048 'any+contentdivergent+orphan': _("do you want to use --any (or --rev)"
2836 feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1049 " and --contentdivergent or "
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1050 "--orphan"),
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1051 'any+orphan': _("do you want to use --any (or --rev)"
38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1052 "and --orphan"),
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1053 }
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1054
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1055 if revopt:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1056 revs = scmutil.revrange(repo, revopt)
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1057 if not revs:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1058 msg = _("set of specified revisions is empty")
1316 f11363699766 evolve: refactoring of the code displaying error when no trouble found Laurent Charignon <lcharignon@fb.com> parents: 1315 diff changeset	1059 else:
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1060 msg = _("no %s changesets in specified revisions") % targetcat
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1061 othertroubles = []
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1062 for cat in unselectedcategories:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1063 if revs & troubled[cat]:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1064 othertroubles.append(cat)
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1065 if othertroubles:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1066 hint = hintmap['+'.join(othertroubles)]
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1067
1422 c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1421 diff changeset	1068 elif anyopt:
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1069 msg = _("no %s changesets to evolve") % targetcat
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1070 othertroubles = []
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1071 for cat in unselectedcategories:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1072 if troubled[cat]:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1073 othertroubles.append(cat)
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1074 if othertroubles:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1075 hint = hintmap['+'.join(othertroubles)]
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1076
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1077 else:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1078 # evolve without any option = relative to the current wdir
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1079 if targetcat == 'orphan':
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1080 msg = _("nothing to evolve on current working copy parent")
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1081 else:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1082 msg = _("current working copy parent is not %s") % targetcat
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1083
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1084 p1 = repo['.'].rev()
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1085 othertroubles = []
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1086 for cat in unselectedcategories:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1087 if p1 in troubled[cat]:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1088 othertroubles.append(cat)
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1089 if othertroubles:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1090 hint = hintmap['+'.join(othertroubles)]
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1091 else:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1092 l = len(troubled[targetcat])
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1093 if l:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1094 hint = _("%d other %s in the repository, do you want --any "
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1095 "or --rev") % (l, targetcat)
750 ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	1096 else:
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1097 othertroubles = []
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1098 for cat in unselectedcategories:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1099 if troubled[cat]:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1100 othertroubles.append(cat)
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1101 if othertroubles:
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1102 hint = hintmap['any+' + ('+'.join(othertroubles))]
750 ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	1103 else:
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1104 msg = _("no troubled changesets")
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1105
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1106 assert msg is not None
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1107 ui.write_err("%s\n" % msg)
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1108 if hint:
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1109 ui.write_err("(%s)\n" % hint)
1316 f11363699766 evolve: refactoring of the code displaying error when no trouble found Laurent Charignon <lcharignon@fb.com> parents: 1315 diff changeset	1110 return 2
f11363699766 evolve: refactoring of the code displaying error when no trouble found Laurent Charignon <lcharignon@fb.com> parents: 1315 diff changeset	1111 else:
f11363699766 evolve: refactoring of the code displaying error when no trouble found Laurent Charignon <lcharignon@fb.com> parents: 1315 diff changeset	1112 return 1
1324 739208d1ee62 evolve: extract cleanup logic in the evolve function Laurent Charignon <lcharignon@fb.com> parents: 1323 diff changeset	1113
739208d1ee62 evolve: extract cleanup logic in the evolve function Laurent Charignon <lcharignon@fb.com> parents: 1323 diff changeset	1114 def _cleanup(ui, repo, startnode, showprogress):
739208d1ee62 evolve: extract cleanup logic in the evolve function Laurent Charignon <lcharignon@fb.com> parents: 1323 diff changeset	1115 if showprogress:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1116 ui.progress(_('evolve'), None)
1099 bac4e0bc9f6a evolve: write a status message when the working directory changes David Soria Parra <davidsp@fb.com> parents: 1067 diff changeset	1117 if repo['.'] != startnode:
bac4e0bc9f6a evolve: write a status message when the working directory changes David Soria Parra <davidsp@fb.com> parents: 1067 diff changeset	1118 ui.status(_('working directory is now at %s\n') % repo['.'])
bac4e0bc9f6a evolve: write a status message when the working directory changes David Soria Parra <davidsp@fb.com> parents: 1067 diff changeset	1119
1408 b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1120 class MultipleSuccessorsError(RuntimeError):
1569 bd1468c23d88 evolve: scattered typo fixes in comments, docstrings Greg Ward <greg@gerg.ca> parents: 1528 diff changeset	1121 """Exception raised by _singlesuccessor when multiple successor sets exists
1408 b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1122
b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1123 The object contains the list of successorssets in its 'successorssets'
b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1124 attribute to call to easily recover.
509 c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1125 """
1408 b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1126
b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1127 def __init__(self, successorssets):
b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1128 self.successorssets = successorssets
b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1129
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1130 def _singlesuccessor(repo, p):
1369 4ed67cce8c23 evolve: properly evolve stacked unstable with --rev Laurent Charignon <lcharignon@fb.com> parents: 1364 diff changeset	1131 """returns p (as rev) if not obsolete or its unique latest successors
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1132
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1133 fail if there are no such successor"""
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1134
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1135 if not p.obsolete():
1369 4ed67cce8c23 evolve: properly evolve stacked unstable with --rev Laurent Charignon <lcharignon@fb.com> parents: 1364 diff changeset	1136 return p.rev()
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1137 obs = repo[p]
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1138 ui = repo.ui
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	1139 newer = compat.successorssets(repo, obs.node())
466 b98490b689a5 stabilize: handle killed changeset in stabilize. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 465 diff changeset	1140 # search of a parent which is not killed
1440 afe46c3b15db evolve: clarify code in _singlesuccessor Laurent Charignon <lcharignon@fb.com> parents: 1428 diff changeset	1141 while not newer:
466 b98490b689a5 stabilize: handle killed changeset in stabilize. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 465 diff changeset	1142 ui.debug("stabilize target %s is plain dead,"
1145 fb51113a1c08 evolve: add the missing newline to output messages where needed Matt Harbison <matt_harbison@yahoo.com> parents: 1144 diff changeset	1143 " trying to stabilize on its parent\n" %
1144 b2a78b950a51 evolve: add the missing argument to a debug statement Matt Harbison <matt_harbison@yahoo.com> parents: 1143 diff changeset	1144 obs)
466 b98490b689a5 stabilize: handle killed changeset in stabilize. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 465 diff changeset	1145 obs = obs.parents()[0]
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	1146 newer = compat.successorssets(repo, obs.node())
1428 20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits Laurent Charignon <lcharignon@fb.com> parents: 1427 diff changeset	1147 if len(newer) > 1 or len(newer[0]) > 1:
1408 b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1148 raise MultipleSuccessorsError(newer)
b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1149
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1150 return repo[newer[0][0]].rev()
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1151
1361 043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1152 def builddependencies(repo, revs):
1411 64515965c0df evolve: some style fix Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	1153 """returns dependency graphs giving an order to solve instability of revs
64515965c0df evolve: some style fix Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	1154 (see _orderrevs for more information on usage)"""
1361 043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1155
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1156 # For each troubled revision we keep track of what instability if any should
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1157 # be resolved in order to resolve it. Example:
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1158 # dependencies = {3: [6], 6:[]}
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1159 # Means that: 6 has no dependency, 3 depends on 6 to be solved
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1160 dependencies = {}
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1161 # rdependencies is the inverted dict of dependencies
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1162 rdependencies = collections.defaultdict(set)
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1163
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1164 for r in revs:
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1165 dependencies[r] = set()
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1166 for p in repo[r].parents():
1408 b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1167 try:
b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1168 succ = _singlesuccessor(repo, p)
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1169 except MultipleSuccessorsError as exc:
1408 b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1170 dependencies[r] = exc.successorssets
1418 ed9a8b1ee9bd evolve: fix error in builddependencies Laurent Charignon <lcharignon@fb.com> parents: 1415 diff changeset	1171 continue
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1172 if succ in revs:
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1173 dependencies[r].add(succ)
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1174 rdependencies[succ].add(r)
1361 043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1175 return dependencies, rdependencies
043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1176
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1177 def _dedupedivergents(repo, revs):
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1178 """Dedupe the divergents revs in revs to get one from each group with the
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1179 lowest revision numbers
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1180 """
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1181 repo = repo.unfiltered()
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1182 res = set()
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1183 # To not reevaluate divergents of the same group once one is encountered
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1184 discarded = set()
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1185 for rev in revs:
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1186 if rev in discarded:
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1187 continue
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1188 divergent = repo[rev]
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1189 base, others = divergentdata(divergent)
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1190 othersrevs = [o.rev() for o in others]
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1191 res.add(min([divergent.rev()] + othersrevs))
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1192 discarded.update(othersrevs)
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1193 return res
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1194
2835 20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1195 instabilities_map = {
2836 feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1196 'contentdivergent': "content-divergent",
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1197 'phasedivergent': "phase-divergent"
2835 20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1198 }
20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1199
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1200 def _selectrevs(repo, allopt, revopt, anyopt, targetcat):
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1201 """select troubles in repo matching according to given options"""
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1202 revs = set()
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1203 if allopt or revopt:
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1204 revs = repo.revs("%s()" % targetcat)
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1205 if revopt:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1206 revs = scmutil.revrange(repo, revopt) & revs
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: 1624 diff changeset	1207 elif not anyopt:
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: 1624 diff changeset	1208 topic = getattr(repo, 'currenttopic', '')
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: 1624 diff changeset	1209 if topic:
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: 1624 diff changeset	1210 revs = repo.revs('topic(%s)', topic) & revs
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1211 elif targetcat == 'orphan':
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: 1624 diff changeset	1212 revs = _aspiringdescendant(repo,
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: 1624 diff changeset	1213 repo.revs('(.::) - obsolete()::'))
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: 1624 diff changeset	1214 revs = set(revs)
2835 20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1215 if targetcat == 'contentdivergent':
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1216 # Pick one divergent per group of divergents
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1217 revs = _dedupedivergents(repo, revs)
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1218 elif anyopt:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1219 revs = repo.revs('first(%s())' % (targetcat))
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1220 elif targetcat == 'orphan':
1421 8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1221 revs = set(_aspiringchildren(repo, repo.revs('(.::) - obsolete()::')))
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1419 diff changeset	1222 if 1 < len(revs):
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1419 diff changeset	1223 msg = "multiple evolve candidates"
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1419 diff changeset	1224 hint = (_("select one of %s with --rev")
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1419 diff changeset	1225 % ', '.join([str(repo[r]) for r in sorted(revs)]))
0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1419 diff changeset	1226 raise error.Abort(msg, hint=hint)
2835 20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1227 elif instabilities_map.get(targetcat, targetcat) in repo['.'].instabilities():
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1228 revs = set([repo['.'].rev()])
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1229 return revs
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1230
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1231
1411 64515965c0df evolve: some style fix Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	1232 def _orderrevs(repo, revs):
64515965c0df evolve: some style fix Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	1233 """Compute an ordering to solve instability for the given revs
1361 043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1234
1571 0e8936e7cb89 evolve: improve the confusing docstring for _orderrevs() Greg Ward <greg@gerg.ca> parents: 1570 diff changeset	1235 revs is a list of unstable revisions.
0e8936e7cb89 evolve: improve the confusing docstring for _orderrevs() Greg Ward <greg@gerg.ca> parents: 1570 diff changeset	1236
0e8936e7cb89 evolve: improve the confusing docstring for _orderrevs() Greg Ward <greg@gerg.ca> parents: 1570 diff changeset	1237 Returns the same revisions ordered to solve their instability from the
1361 043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1238 bottom to the top of the stack that the stabilization process will produce
043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1239 eventually.
043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1240
1571 0e8936e7cb89 evolve: improve the confusing docstring for _orderrevs() Greg Ward <greg@gerg.ca> parents: 1570 diff changeset	1241 This ensures the minimal number of stabilizations, as we can stabilize each
0e8936e7cb89 evolve: improve the confusing docstring for _orderrevs() Greg Ward <greg@gerg.ca> parents: 1570 diff changeset	1242 revision on its final stabilized destination.
1361 043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1243 """
043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1244 # Step 1: Build the dependency graph
043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1245 dependencies, rdependencies = builddependencies(repo, revs)
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1246 # Step 2: Build the ordering
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1247 # Remove the revisions with no dependency(A) and add them to the ordering.
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1248 # Removing these revisions leads to new revisions with no dependency (the
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1249 # one depending on A) that we can remove from the dependency graph and add
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1250 # to the ordering. We progress in a similar fashion until the ordering is
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1251 # built
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1252 solvablerevs = collections.deque([r for r in sorted(dependencies.keys())
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1253 if not dependencies[r]])
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1254 ordering = []
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1255 while solvablerevs:
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1256 rev = solvablerevs.popleft()
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1257 for dependent in rdependencies[rev]:
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1258 dependencies[dependent].remove(rev)
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1259 if not dependencies[dependent]:
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1260 solvablerevs.append(dependent)
1412 8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1261 del dependencies[rev]
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1262 ordering.append(rev)
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1263
1412 8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1264 ordering.extend(sorted(dependencies))
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1265 return ordering
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1266
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1267 def divergentsets(repo, ctx):
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1268 """Compute sets of commits divergent with a given one"""
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1269 cache = {}
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1270 base = {}
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	1271 for n in compat.allprecursors(repo.obsstore, [ctx.node()]):
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1272 if n == ctx.node():
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1273 # a node can't be a base for divergence with itself
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1274 continue
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	1275 nsuccsets = compat.successorssets(repo, n, cache)
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1276 for nsuccset in nsuccsets:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1277 if ctx.node() in nsuccset:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1278 # we are only interested in other successor sets
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1279 continue
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1280 if tuple(nsuccset) in base:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1281 # we already know the latest base for this divergency
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1282 continue
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1283 base[tuple(nsuccset)] = n
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1284 divergence = []
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1285 for divset, b in base.iteritems():
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1286 divergence.append({
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1287 'divergentnodes': divset,
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1288 'commonprecursor': b
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1289 })
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1290
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1291 return divergence
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1292
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1293 def _preparelistctxs(items, condition):
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1294 return [item.hex() for item in items if condition(item)]
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1295
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1296 def _formatctx(fm, ctx):
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1297 fm.data(node=ctx.hex())
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1298 fm.data(desc=ctx.description())
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1299 fm.data(date=ctx.date())
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1300 fm.data(user=ctx.user())
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1301
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1302 def listtroubles(ui, repo, troublecategories, **opts):
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1303 """Print all the troubles for the repo (or given revset)"""
2836 feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1304 troublecategories = troublecategories or ['contentdivergent', 'orphan', 'phasedivergent']
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1305 showunstable = 'orphan' in troublecategories
2836 feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1306 showbumped = 'phasedivergent' in troublecategories
2835 20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1307 showdivergent = 'contentdivergent' in troublecategories
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1308
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1309 revs = repo.revs('+'.join("%s()" % t for t in troublecategories))
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1310 if opts.get('rev'):
2479 df9233aa4bac evolve: fix --rev with --list Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2475 diff changeset	1311 revs = scmutil.revrange(repo, opts.get('rev'))
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1312
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1313 fm = ui.formatter('evolvelist', opts)
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1314 for rev in revs:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1315 ctx = repo[rev]
2838 1c9150e30b28 context: unstable was deprecated Boris Feld <boris.feld@octobus.net> parents: 2836 diff changeset	1316 unpars = _preparelistctxs(ctx.parents(), lambda p: p.orphan())
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1317 obspars = _preparelistctxs(ctx.parents(), lambda p: p.obsolete())
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1318 imprecs = _preparelistctxs(repo.set("allprecursors(%n)", ctx.node()),
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1319 lambda p: not p.mutable())
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1320 dsets = divergentsets(repo, ctx)
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1321
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1322 fm.startitem()
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1323 # plain formatter section
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1324 hashlen, desclen = 12, 60
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1325 desc = ctx.description()
1637 078e6777ac15 list: limit to descriptions to firstline timeless@gmail.com parents: 1636 diff changeset	1326 if desc:
078e6777ac15 list: limit to descriptions to firstline timeless@gmail.com parents: 1636 diff changeset	1327 desc = desc.splitlines()[0]
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1328 desc = (desc[:desclen] + '...') if len(desc) > desclen else desc
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1329 fm.plain('%s: ' % ctx.hex()[:hashlen])
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1330 fm.plain('%s\n' % desc)
1680 fe4b41a2af4e evolve: include node, rev, desc, and phase in list timeless@gmail.com parents: 1679 diff changeset	1331 fm.data(node=ctx.hex(), rev=ctx.rev(), desc=desc, phase=ctx.phasestr())
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1332
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1333 for unpar in unpars if showunstable else []:
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1334 fm.plain(' orphan: %s (orphan parent)\n' % unpar[:hashlen])
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1335 for obspar in obspars if showunstable else []:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1336 fm.plain(' unstable: %s (obsolete parent)\n' % obspar[:hashlen])
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1337 for imprec in imprecs if showbumped else []:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1338 fm.plain(' bumped: %s (immutable precursor)\n' % imprec[:hashlen])
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1339
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1340 if dsets and showdivergent:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1341 for dset in dsets:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1342 fm.plain(' divergent: ')
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1343 first = True
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1344 for n in dset['divergentnodes']:
1646 7e1b49cda66c list: report the phase for divergent commits timeless@gmail.com parents: 1640 diff changeset	1345 t = "%s (%s)" if first else " %s (%s)"
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1346 first = False
1646 7e1b49cda66c list: report the phase for divergent commits timeless@gmail.com parents: 1640 diff changeset	1347 fm.plain(t % (node.hex(n)[:hashlen], repo[n].phasestr()))
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1348 comprec = node.hex(dset['commonprecursor'])[:hashlen]
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1349 fm.plain(" (precursor %s)\n" % comprec)
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1350 fm.plain("\n")
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1351
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1352 # templater-friendly section
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1353 _formatctx(fm, ctx)
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1354 troubles = []
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1355 for unpar in unpars:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1356 troubles.append({'troubletype': 'unstable', 'sourcenode': unpar,
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1357 'sourcetype': 'unstableparent'})
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1358 for obspar in obspars:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1359 troubles.append({'troubletype': 'unstable', 'sourcenode': obspar,
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1360 'sourcetype': 'obsoleteparent'})
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1361 for imprec in imprecs:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1362 troubles.append({'troubletype': 'bumped', 'sourcenode': imprec,
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1363 'sourcetype': 'immutableprecursor'})
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1364 for dset in dsets:
1679 db1db8633b8c evolve: use hex in list output timeless@gmail.com parents: 1678 diff changeset	1365 divnodes = [{'node': node.hex(n),
1680 fe4b41a2af4e evolve: include node, rev, desc, and phase in list timeless@gmail.com parents: 1679 diff changeset	1366 'phase': repo[n].phasestr(),
1679 db1db8633b8c evolve: use hex in list output timeless@gmail.com parents: 1678 diff changeset	1367 } for n in dset['divergentnodes']]
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1368 troubles.append({'troubletype': 'divergent',
1679 db1db8633b8c evolve: use hex in list output timeless@gmail.com parents: 1678 diff changeset	1369 'commonprecursor': node.hex(dset['commonprecursor']),
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1370 'divergentnodes': divnodes})
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1371 fm.data(troubles=troubles)
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1372
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1373 fm.end()
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1374
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1375 @eh.command(
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1376 '^evolve\|stabilize\|solve',
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1377 [('n', 'dry-run', False,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1378 _('do not perform actions, just print what would be done')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1379 ('', 'confirm', False,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1380 _('ask for confirmation before performing the action')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1381 ('A', 'any', False,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1382 _('also consider troubled changesets unrelated to current working '
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1383 'directory')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1384 ('r', 'rev', [], _('solves troubles of these revisions')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1385 ('', 'bumped', False, _('solves only bumped changesets')),
2858 4b934144ed11 messages: use hyphenated '{phase,content}-divergent' in user messages Martin von Zweigbergk <martinvonz@google.com> parents: 2857 diff changeset	1386 ('', 'phasedivergent', False, _('solves only phase-divergent changesets')),
2859 2a228fb6c23e evolve: undo change from "divergent" to "phasedivergent" for --divergent Martin von Zweigbergk <martinvonz@google.com> parents: 2858 diff changeset	1387 ('', 'divergent', False, _('solves only divergent changesets')),
2858 4b934144ed11 messages: use hyphenated '{phase,content}-divergent' in user messages Martin von Zweigbergk <martinvonz@google.com> parents: 2857 diff changeset	1388 ('', 'contentdivergent', False, _('solves only content-divergent changesets')),
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1389 ('', 'unstable', False, _('solves only unstable changesets')),
38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1390 ('', 'orphan', False, _('solves only orphan changesets (default)')),
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1391 ('a', 'all', False, _('evolve all troubled changesets related to the '
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1392 'current working directory and its descendants')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1393 ('c', 'continue', False, _('continue an interrupted evolution')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1394 ('l', 'list', False, 'provide details on troubled changesets in the repo'),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1395 ] + mergetoolopts,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1396 _('[OPTIONS]...')
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1397 )
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	1398 def evolve(ui, repo, **opts):
1528 afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1399 """solve troubled changesets in your repository
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1400
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1401 Modifying history can lead to various types of troubled changesets:
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1402 unstable, bumped, or divergent. The evolve command resolves your troubles
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1403 by executing one of the following actions:
1528 afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1404
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1405 - update working copy to a successor
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1406 - rebase an unstable changeset
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1407 - extract the desired changes from a bumped changeset
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1408 - fuse divergent changesets back together
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1409
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1410 If you pass no arguments, evolve works in automatic mode: it will execute a
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1411 single action to reduce instability related to your working copy. There are
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1412 two cases for this action. First, if the parent of your working copy is
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1413 obsolete, evolve updates to the parent's successor. Second, if the working
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1414 copy parent is not obsolete but has obsolete predecessors, then evolve
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1415 determines if there is an unstable changeset that can be rebased onto the
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1416 working copy parent in order to reduce instability.
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1417 If so, evolve rebases that changeset. If not, evolve refuses to guess your
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1418 intention, and gives a hint about what you might want to do next.
1528 afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1419
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1420 Any time evolve creates a changeset, it updates the working copy to the new
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1421 changeset. (Currently, every successful evolve operation involves an update
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1422 as well; this may change in future.)
1528 afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1423
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1424 Automatic mode only handles common use cases. For example, it avoids taking
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1425 action in the case of ambiguity, and it ignores unstable changesets that
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1426 are not related to your working copy.
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1427 It also refuses to solve bumped or divergent changesets unless you explicity
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1428 request such behavior (see below).
1528 afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1429
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1430 Eliminating all instability around your working copy may require multiple
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1431 invocations of :hg:`evolve`. Alternately, use ``--all`` to recursively
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1432 select and evolve all unstable changesets that can be rebased onto the
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1433 working copy parent.
1528 afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1434 This is more powerful than successive invocations, since ``--all`` handles
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1435 ambiguous cases (e.g. unstable changesets with multiple children) by
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1436 evolving all branches.
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1437
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1438 When your repository cannot be handled by automatic mode, you might need to
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1439 use ``--rev`` to specify a changeset to evolve. For example, if you have
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1440 an unstable changeset that is not related to the working copy parent,
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1441 you could use ``--rev`` to evolve it. Or, if some changeset has multiple
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1442 unstable children, evolve in automatic mode refuses to guess which one to
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1443 evolve; you have to use ``--rev`` in that case.
1528 afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1444
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1445 Alternately, ``--any`` makes evolve search for the next evolvable changeset
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1446 regardless of whether it is related to the working copy parent.
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1447
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1448 You can supply multiple revisions to evolve multiple troubled changesets
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1449 in a single invocation. In revset terms, ``--any`` is equivalent to ``--rev
1528 afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1450 first(unstable())``. ``--rev`` and ``--all`` are mutually exclusive, as are
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1451 ``--rev`` and ``--any``.
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1452
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1453 ``hg evolve --any --all`` is useful for cleaning up instability across all
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1454 branches, letting evolve figure out the appropriate order and destination.
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1455
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1456 When you have troubled changesets that are not unstable, :hg:`evolve`
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1457 refuses to consider them unless you specify the category of trouble you
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1458 wish to resolve, with ``--bumped`` or ``--divergent``. These options are
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1459 currently mutually exclusive with each other and with ``--unstable``
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1460 (the default). You can combine ``--bumped`` or ``--divergent`` with
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1461 ``--rev``, ``--all``, or ``--any``.
1528 afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1462
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1463 You can also use the evolve command to list the troubles affecting your
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1464 repository by using the --list flag. You can choose to display only some
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1465 categories of troubles with the --unstable, --divergent or --bumped flags.
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	1466 """
145 928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	1467
1325 1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1324 diff changeset	1468 # Options
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1469 listopt = opts['list']
465 4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	1470 contopt = opts['continue']
4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	1471 anyopt = opts['any']
704 2ec7c3673679 evolve: add --all argument. Levi Bard <levi@unity3d.com> parents: 703 diff changeset	1472 allopt = opts['all']
1318 29363f79514f evolve: move code to track progress and start node Laurent Charignon <lcharignon@fb.com> parents: 1317 diff changeset	1473 startnode = repo['.']
703 a246b02499d9 evolve: extract evolve --any implementation into a function. Levi Bard <levi@unity3d.com> parents: 663 diff changeset	1474 dryrunopt = opts['dry_run']
1047 d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1475 confirmopt = opts['confirm']
1325 1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1324 diff changeset	1476 revopt = opts['rev']
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1477
38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1478 # Backward compatibility
38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1479 if opts['unstable']:
38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1480 msg = ("'evolve --unstable' is deprecated, "
38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1481 "use 'evolve --orphan'")
38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1482 repo.ui.deprecwarn(msg, '4.4')
38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1483
38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1484 opts['orphan'] = opts['divergent']
38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1485
2835 20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1486 if opts['divergent']:
20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1487 msg = ("'evolve --divergent' is deprecated, "
20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1488 "use 'evolve --contentdivergent'")
20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1489 repo.ui.deprecwarn(msg, '4.4')
20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1490
20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1491 opts['contentdivergent'] = opts['divergent']
20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2834 diff changeset	1492
2836 feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1493 if opts['bumped']:
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1494 msg = ("'evolve --bumped' is deprecated, "
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1495 "use 'evolve --phasedivergent'")
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1496 repo.ui.deprecwarn(msg, '4.4')
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1497
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1498 opts['phasedivergent'] = opts['bumped']
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1499
feaa52680682 log: bumped was renamed into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	1500 troublecategories = ['phasedivergent', 'contentdivergent', 'orphan']
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1501 specifiedcategories = [t for t in troublecategories if opts[t]]
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1502 if listopt:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1503 listtroubles(ui, repo, specifiedcategories, **opts)
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1504 return
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1505
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1506 targetcat = 'orphan'
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1507 if 1 < len(specifiedcategories):
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1508 msg = _('cannot specify more than one trouble category to solve (yet)')
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1509 raise error.Abort(msg)
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1510 elif len(specifiedcategories) == 1:
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1511 targetcat = specifiedcategories[0]
1409 3276730e4b32 evolve: move the 'update' if '.' is obsolete earlier Pierre-Yves David <pierre-yves.david@fb.com> parents: 1408 diff changeset	1512 elif repo['.'].obsolete():
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1513 displayer = cmdutil.show_changeset(ui, repo,
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1514 {'template': shorttemplate})
1409 3276730e4b32 evolve: move the 'update' if '.' is obsolete earlier Pierre-Yves David <pierre-yves.david@fb.com> parents: 1408 diff changeset	1515 # no args and parent is obsolete, update to successors
3276730e4b32 evolve: move the 'update' if '.' is obsolete earlier Pierre-Yves David <pierre-yves.david@fb.com> parents: 1408 diff changeset	1516 try:
3276730e4b32 evolve: move the 'update' if '.' is obsolete earlier Pierre-Yves David <pierre-yves.david@fb.com> parents: 1408 diff changeset	1517 ctx = repo[_singlesuccessor(repo, repo['.'])]
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1518 except MultipleSuccessorsError as exc:
1409 3276730e4b32 evolve: move the 'update' if '.' is obsolete earlier Pierre-Yves David <pierre-yves.david@fb.com> parents: 1408 diff changeset	1519 repo.ui.write_err('parent is obsolete with multiple successors:\n')
3276730e4b32 evolve: move the 'update' if '.' is obsolete earlier Pierre-Yves David <pierre-yves.david@fb.com> parents: 1408 diff changeset	1520 for ln in exc.successorssets:
3276730e4b32 evolve: move the 'update' if '.' is obsolete earlier Pierre-Yves David <pierre-yves.david@fb.com> parents: 1408 diff changeset	1521 for n in ln:
3276730e4b32 evolve: move the 'update' if '.' is obsolete earlier Pierre-Yves David <pierre-yves.david@fb.com> parents: 1408 diff changeset	1522 displayer.show(repo[n])
3276730e4b32 evolve: move the 'update' if '.' is obsolete earlier Pierre-Yves David <pierre-yves.david@fb.com> parents: 1408 diff changeset	1523 return 2
3276730e4b32 evolve: move the 'update' if '.' is obsolete earlier Pierre-Yves David <pierre-yves.david@fb.com> parents: 1408 diff changeset	1524
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1525 ui.status(_('update:'))
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1526 if not ui.quiet:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1527 displayer.show(ctx)
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1528
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1529 if dryrunopt:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1530 return 0
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1531 res = hg.update(repo, ctx.rev())
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1532 if ctx != startnode:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1533 ui.status(_('working directory is now at %s\n') % ctx)
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1534 return res
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1535
986 c1f8ece4182d evolve: add --tool option so we don't have to use HGMERGE Greg Ward <greg@gerg.ca> parents: 985 diff changeset	1536 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'evolve')
1323 603104c880f7 evolve: simplify the evolve function Laurent Charignon <lcharignon@fb.com> parents: 1322 diff changeset	1537 troubled = set(repo.revs('troubled()'))
145 928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	1538
1318 29363f79514f evolve: move code to track progress and start node Laurent Charignon <lcharignon@fb.com> parents: 1317 diff changeset	1539 # Progress handling
29363f79514f evolve: move code to track progress and start node Laurent Charignon <lcharignon@fb.com> parents: 1317 diff changeset	1540 seen = 1
1323 603104c880f7 evolve: simplify the evolve function Laurent Charignon <lcharignon@fb.com> parents: 1322 diff changeset	1541 count = allopt and len(troubled) or 1
1319 8376fe35ebda evolve: add new variable and comment Laurent Charignon <lcharignon@fb.com> parents: 1318 diff changeset	1542 showprogress = allopt
1318 29363f79514f evolve: move code to track progress and start node Laurent Charignon <lcharignon@fb.com> parents: 1317 diff changeset	1543
29363f79514f evolve: move code to track progress and start node Laurent Charignon <lcharignon@fb.com> parents: 1317 diff changeset	1544 def progresscb():
1325 1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1324 diff changeset	1545 if revopt or allopt:
1624 081605c2e9b6 evolve: mark progress units for translation Anton Shestakov <av6@dwimlabs.net> parents: 1623 diff changeset	1546 ui.progress(_('evolve'), seen, unit=_('changesets'), total=count)
1099 bac4e0bc9f6a evolve: write a status message when the working directory changes David Soria Parra <davidsp@fb.com> parents: 1067 diff changeset	1547
1319 8376fe35ebda evolve: add new variable and comment Laurent Charignon <lcharignon@fb.com> parents: 1318 diff changeset	1548 # Continuation handling
465 4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	1549 if contopt:
4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	1550 if anyopt:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1551 raise error.Abort('cannot specify both "--any" and "--continue"')
704 2ec7c3673679 evolve: add --all argument. Levi Bard <levi@unity3d.com> parents: 703 diff changeset	1552 if allopt:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1553 raise error.Abort('cannot specify both "--all" and "--continue"')
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	1554 state = _evolvestateread(repo)
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	1555 if state is None:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	1556 raise error.Abort('no evolve to continue')
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	1557 orig = repo[state['current']]
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	1558 # XXX This is a terrible terrible hack, please get rid of it.
1722 b4be34677fda continue: ensure we hold the wlock before writing file to disk Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1720 diff changeset	1559 lock = repo.wlock()
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	1560 try:
2051 74934195747b evolve: switch away from deprecated repo.opener Martin von Zweigbergk <martinvonz@google.com> parents: 2049 diff changeset	1561 repo.vfs.write('graftstate', orig.hex() + '\n')
1722 b4be34677fda continue: ensure we hold the wlock before writing file to disk Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1720 diff changeset	1562 try:
b4be34677fda continue: ensure we hold the wlock before writing file to disk Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1720 diff changeset	1563 graftcmd = commands.table['graft'][0]
b4be34677fda continue: ensure we hold the wlock before writing file to disk Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1720 diff changeset	1564 ret = graftcmd(ui, repo, old_obsolete=True, **{'continue': True})
b4be34677fda continue: ensure we hold the wlock before writing file to disk Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1720 diff changeset	1565 _evolvestatedelete(repo)
b4be34677fda continue: ensure we hold the wlock before writing file to disk Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1720 diff changeset	1566 return ret
b4be34677fda continue: ensure we hold the wlock before writing file to disk Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1720 diff changeset	1567 finally:
2070 9105c3c54045 cleanup: stop using 'repo.join' methods Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2064 diff changeset	1568 util.unlinkpath(repo.vfs.join('graftstate'), ignoremissing=True)
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	1569 finally:
1722 b4be34677fda continue: ensure we hold the wlock before writing file to disk Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1720 diff changeset	1570 lock.release()
1402 08ae023882f1 evolve: check for uncommited change earlier Laurent Charignon <lcharignon@fb.com> parents: 1398 diff changeset	1571 cmdutil.bailifchanged(repo)
08ae023882f1 evolve: check for uncommited change earlier Laurent Charignon <lcharignon@fb.com> parents: 1398 diff changeset	1572
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1573 if revopt and allopt:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1574 raise error.Abort('cannot specify both "--rev" and "--all"')
1405 eaf82490af76 evolve: prevent using --rev and --any together Laurent Charignon <lcharignon@fb.com> parents: 1404 diff changeset	1575 if revopt and anyopt:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1576 raise error.Abort('cannot specify both "--rev" and "--any"')
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1577
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1578 revs = _selectrevs(repo, allopt, revopt, anyopt, targetcat)
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1579
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1580 if not revs:
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1581 return _handlenotrouble(ui, repo, allopt, revopt, anyopt, targetcat)
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1582
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1583 # For the progress bar to show
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1584 count = len(revs)
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1585 # Order the revisions
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	1586 if targetcat == 'orphan':
1411 64515965c0df evolve: some style fix Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	1587 revs = _orderrevs(repo, revs)
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1588 for rev in revs:
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1589 progresscb()
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1590 _solveone(ui, repo, repo[rev], dryrunopt, confirmopt,
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1591 progresscb, targetcat)
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1592 seen += 1
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1593 progresscb()
1324 739208d1ee62 evolve: extract cleanup logic in the evolve function Laurent Charignon <lcharignon@fb.com> parents: 1323 diff changeset	1594 _cleanup(ui, repo, startnode, showprogress)
1099 bac4e0bc9f6a evolve: write a status message when the working directory changes David Soria Parra <davidsp@fb.com> parents: 1067 diff changeset	1595
1421 8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1596 def _possibledestination(repo, rev):
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1597 """return all changesets that may be a new parent for REV"""
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1598 tonode = repo.changelog.node
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1599 parents = repo.changelog.parentrevs
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1600 torev = repo.changelog.rev
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1601 dest = set()
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1602 tovisit = list(parents(rev))
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1603 while tovisit:
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1604 r = tovisit.pop()
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	1605 succsets = compat.successorssets(repo, tonode(r))
1421 8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1606 if not succsets:
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1607 tovisit.extend(parents(r))
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1608 else:
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1609 # We should probably pick only one destination from split
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1610 # (case where '1 < len(ss)'), This could be the currently tipmost
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1611 # but logic is less clear when result of the split are now on
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1612 # multiple branches.
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1613 for ss in succsets:
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1614 for n in ss:
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1615 dest.add(torev(n))
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1616 return dest
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1617
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1618 def _aspiringchildren(repo, revs):
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1419 diff changeset	1619 """Return a list of changectx which can be stabilized on top of pctx or
1421 8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1620 one of its descendants. Empty list if none can be found."""
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1621 target = set(revs)
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1419 diff changeset	1622 result = []
2842 2b8b960a04ee revset: unstable() is deprecated Boris Feld <boris.feld@octobus.net> parents: 2840 diff changeset	1623 for r in repo.revs('orphan() - %ld', revs):
1421 8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1624 dest = _possibledestination(repo, r)
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1625 if target & dest:
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1626 result.append(r)
1420 0b714c4ad9ff evolve: consider all potential candidates on bare evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1419 diff changeset	1627 return result
468 6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 466 diff changeset	1628
1422 c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1421 diff changeset	1629 def _aspiringdescendant(repo, revs):
c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1421 diff changeset	1630 """Return a list of changectx which can be stabilized on top of pctx or
c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1421 diff changeset	1631 one of its descendants recursively. Empty list if none can be found."""
c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1421 diff changeset	1632 target = set(revs)
c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1421 diff changeset	1633 result = set(target)
1423 ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1634 paths = collections.defaultdict(set)
2842 2b8b960a04ee revset: unstable() is deprecated Boris Feld <boris.feld@octobus.net> parents: 2840 diff changeset	1635 for r in repo.revs('orphan() - %ld', revs):
1423 ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1636 for d in _possibledestination(repo, r):
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1637 paths[d].add(r)
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1638
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1639 result = set(target)
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1640 tovisit = list(revs)
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1641 while tovisit:
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1642 base = tovisit.pop()
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1643 for unstable in paths[base]:
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1644 if unstable not in result:
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1645 tovisit.append(unstable)
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1646 result.add(unstable)
1422 c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1421 diff changeset	1647 return sorted(result - target)
c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1421 diff changeset	1648
1047 d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1649 def _solveunstable(ui, repo, orig, dryrun=False, confirm=False,
d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1650 progresscb=None):
1569 bd1468c23d88 evolve: scattered typo fixes in comments, docstrings Greg Ward <greg@gerg.ca> parents: 1528 diff changeset	1651 """Stabilize an unstable changeset"""
1576 526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1652 pctx = orig.p1()
2699 fddaf14783b1 evolve: preserve the branch of the original changeset when evolving merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2693 diff changeset	1653 keepbranch = orig.p1().branch() != orig.branch()
1576 526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1654 if len(orig.parents()) == 2:
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1655 if not pctx.obsolete():
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1656 pctx = orig.p2() # second parent is obsolete ?
2699 fddaf14783b1 evolve: preserve the branch of the original changeset when evolving merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2693 diff changeset	1657 keepbranch = orig.p2().branch() != orig.branch()
1576 526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1658 elif orig.p2().obsolete():
1639 ff0ff0f28a13 evolve: report merge node timeless@gmail.com parents: 1638 diff changeset	1659 hint = _("Redo the merge (%s) and use `hg prune <old> "
ff0ff0f28a13 evolve: report merge node timeless@gmail.com parents: 1638 diff changeset	1660 "--succ <new>` to obsolete the old one") % orig.hex()[:12]
1638 5b7596805f7f evolve: treat no support as non fatal timeless@gmail.com parents: 1637 diff changeset	1661 ui.warn(_("warning: no support for evolving merge changesets "
5b7596805f7f evolve: treat no support as non fatal timeless@gmail.com parents: 1637 diff changeset	1662 "with two obsolete parents yet\n") +
5b7596805f7f evolve: treat no support as non fatal timeless@gmail.com parents: 1637 diff changeset	1663 _("(%s)\n") % hint)
5b7596805f7f evolve: treat no support as non fatal timeless@gmail.com parents: 1637 diff changeset	1664 return False
1576 526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1665
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1666 if not pctx.obsolete():
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1667 ui.warn(_("cannot solve instability of %s, skipping\n") % orig)
1354 b4a62d6f0353 evolve: don't crash on singled out revisions Laurent Charignon <lcharignon@fb.com> parents: 1351 diff changeset	1668 return False
1576 526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1669 obs = pctx
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	1670 newer = compat.successorssets(repo, obs.node())
466 b98490b689a5 stabilize: handle killed changeset in stabilize. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 465 diff changeset	1671 # search of a parent which is not killed
588 89c8550019d0 mercurial: replace all `newerversion` call by `successorsset` call Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 587 diff changeset	1672 while not newer or newer == [()]:
466 b98490b689a5 stabilize: handle killed changeset in stabilize. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 465 diff changeset	1673 ui.debug("stabilize target %s is plain dead,"
1145 fb51113a1c08 evolve: add the missing newline to output messages where needed Matt Harbison <matt_harbison@yahoo.com> parents: 1144 diff changeset	1674 " trying to stabilize on its parent\n" %
1144 b2a78b950a51 evolve: add the missing argument to a debug statement Matt Harbison <matt_harbison@yahoo.com> parents: 1143 diff changeset	1675 obs)
466 b98490b689a5 stabilize: handle killed changeset in stabilize. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 465 diff changeset	1676 obs = obs.parents()[0]
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	1677 newer = compat.successorssets(repo, obs.node())
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1678 if len(newer) > 1:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1679 msg = _("skipping %s: divergent rewriting. can't choose "
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1680 "destination\n") % obs
1412 8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1681 ui.write_err(msg)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1682 return 2
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1683 targets = newer[0]
466 b98490b689a5 stabilize: handle killed changeset in stabilize. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 465 diff changeset	1684 assert targets
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1685 if len(targets) > 1:
1481 3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1686 # split target, figure out which one to pick, are they all in line?
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1687 targetrevs = [repo[r].rev() for r in targets]
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1688 roots = repo.revs('roots(%ld)', targetrevs)
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1689 heads = repo.revs('heads(%ld)', targetrevs)
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1690 if len(roots) > 1 or len(heads) > 1:
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1691 msg = "cannot solve split accross two branches\n"
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1692 ui.write_err(msg)
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1693 return 2
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1694 target = repo[heads.first()]
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1695 else:
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1696 target = targets[0]
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1697 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1698 target = repo[target]
1047 d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1699 if not ui.quiet or confirm:
1046 296d48e1f55a evolve: gather evolve output together Pierre-Yves David <pierre-yves.david@fb.com> parents: 1045 diff changeset	1700 repo.ui.write(_('move:'))
464 d88c761f97c4 stabilize: rename "node" variable to "orig" Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 463 diff changeset	1701 displayer.show(orig)
1046 296d48e1f55a evolve: gather evolve output together Pierre-Yves David <pierre-yves.david@fb.com> parents: 1045 diff changeset	1702 repo.ui.write(_('atop:'))
146 e80a6c8ad452 stabilize: proper --quiet behavior Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 145 diff changeset	1703 displayer.show(target)
1390 03f202bed47f evolve: fix default value for --confirm Pierre-Yves David <pierre-yves.david@fb.com> parents: 1389 diff changeset	1704 if confirm and ui.prompt('perform evolve? [Ny]', 'n') != 'y':
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1705 raise error.Abort(_('evolve aborted by user'))
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1706 if progresscb:
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1707 progresscb()
546 415540dee2bd fix missing --dest evolve output in dryrun Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 540 diff changeset	1708 todo = 'hg rebase -r %s -d %s\n' % (orig, target)
468 6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 466 diff changeset	1709 if dryrun:
146 e80a6c8ad452 stabilize: proper --quiet behavior Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 145 diff changeset	1710 repo.ui.write(todo)
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1711 else:
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1712 repo.ui.note(todo)
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1713 if progresscb:
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1714 progresscb()
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1715 try:
1576 526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1716 relocate(repo, orig, target, pctx, keepbranch)
463 3f91654713dd obsolete Move merge failure handling into stabilize code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 455 diff changeset	1717 except MergeFailure:
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	1718 _evolvestatewrite(repo, {'current': orig.node()})
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	1719 repo.ui.write_err(_('evolve failed!\n'))
949 2b2a4ab0eb68 evolve: make most line lenghts 80 characters or less Angel Ezquerra <angel.ezquerra@gmail.com> parents: 948 diff changeset	1720 repo.ui.write_err(
1756 a7dcfff8c4a9 evolve: use single quotes in usage messages Martin von Zweigbergk <martinvonz@google.com> parents: 1755 diff changeset	1721 _("fix conflict and run 'hg evolve --continue'"
a7dcfff8c4a9 evolve: use single quotes in usage messages Martin von Zweigbergk <martinvonz@google.com> parents: 1755 diff changeset	1722 " or use 'hg update -C .' to abort\n"))
463 3f91654713dd obsolete Move merge failure handling into stabilize code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 455 diff changeset	1723 raise
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	1724
1047 d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1725 def _solvebumped(ui, repo, bumped, dryrun=False, confirm=False,
d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1726 progresscb=None):
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1727 """Stabilize a bumped changeset"""
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1728 repo = repo.unfiltered()
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1729 bumped = repo[bumped.rev()]
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1730 # For now we deny bumped merge
26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1731 if len(bumped.parents()) > 1:
1496 62aa11956a40 evolve: _() should not contain % timeless@mozdev.org parents: 1495 diff changeset	1732 msg = _('skipping %s : we do not handle merge yet\n') % bumped
1412 8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1733 ui.write_err(msg)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1734 return 2
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1735 prec = repo.set('last(allprecursors(%d) and public())', bumped).next()
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1736 # For now we deny target merge
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1737 if len(prec.parents()) > 1:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1738 msg = _('skipping: %s: public version is a merge, '
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1739 'this is not handled yet\n') % prec
1412 8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1740 ui.write_err(msg)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1741 return 2
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1742
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1743 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
1047 d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1744 if not ui.quiet or confirm:
1046 296d48e1f55a evolve: gather evolve output together Pierre-Yves David <pierre-yves.david@fb.com> parents: 1045 diff changeset	1745 repo.ui.write(_('recreate:'))
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1746 displayer.show(bumped)
1046 296d48e1f55a evolve: gather evolve output together Pierre-Yves David <pierre-yves.david@fb.com> parents: 1045 diff changeset	1747 repo.ui.write(_('atop:'))
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1748 displayer.show(prec)
1390 03f202bed47f evolve: fix default value for --confirm Pierre-Yves David <pierre-yves.david@fb.com> parents: 1389 diff changeset	1749 if confirm and ui.prompt('perform evolve? [Ny]', 'n') != 'y':
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1750 raise error.Abort(_('evolve aborted by user'))
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1751 if dryrun:
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1752 todo = 'hg rebase --rev %s --dest %s;\n' % (bumped, prec.p1())
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1753 repo.ui.write(todo)
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1754 repo.ui.write(('hg update %s;\n' % prec))
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1755 repo.ui.write(('hg revert --all --rev %s;\n' % bumped))
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1756 repo.ui.write(('hg commit --msg "bumped update to %s"'))
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1757 return 0
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1758 if progresscb:
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1759 progresscb()
1021 200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1760 newid = tmpctx = None
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1761 tmpctx = bumped
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1762 # Basic check for common parent. Far too complicated and fragile
1593 2f117c299325 evolve: remove meaningless transaction nesting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 1592 diff changeset	1763 tr = repo.currenttransaction()
2f117c299325 evolve: remove meaningless transaction nesting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 1592 diff changeset	1764 assert tr is not None
1506 a55c691f4cc0 evolve: use repo._bookmarks.recordchange instead of repo._bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1505 diff changeset	1765 bmupdate = _bookmarksupdater(repo, bumped.node(), tr)
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1766 if not list(repo.set('parents(%d) and parents(%d)', bumped, prec)):
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1767 # Need to rebase the changeset at the right place
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1768 repo.ui.status(
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1769 _('rebasing to destination parent: %s\n') % prec.p1())
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1770 try:
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1771 tmpid = relocate(repo, bumped, prec.p1())
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1772 if tmpid is not None:
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1773 tmpctx = repo[tmpid]
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1774 obsolete.createmarkers(repo, [(bumped, (tmpctx,))])
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1775 except MergeFailure:
2051 74934195747b evolve: switch away from deprecated repo.opener Martin von Zweigbergk <martinvonz@google.com> parents: 2049 diff changeset	1776 repo.vfs.write('graftstate', bumped.hex() + '\n')
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1777 repo.ui.write_err(_('evolution failed!\n'))
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1778 msg = _("fix conflict and run 'hg evolve --continue'\n")
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1779 repo.ui.write_err(msg)
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1780 raise
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1781 # Create the new commit context
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1782 repo.ui.status(_('computing new diff\n'))
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1783 files = set()
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1784 copied = copies.pathcopies(prec, bumped)
1736 c9a79b432907 merge with stable Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1732 1735 diff changeset	1785 precmanifest = prec.manifest().copy()
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1786 # 3.3.2 needs a list.
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1787 # future 3.4 don't detect the size change during iteration
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1788 # this is fishy
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1789 for key, val in list(bumped.manifest().iteritems()):
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1790 precvalue = precmanifest.get(key, None)
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1791 if precvalue is not None:
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1792 del precmanifest[key]
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1793 if precvalue != val:
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1794 files.add(key)
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1795 files.update(precmanifest) # add missing files
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1796 # commit it
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1797 if files: # something to commit!
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1798 def filectxfn(repo, ctx, path):
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1799 if path in bumped:
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1800 fctx = bumped[path]
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1801 flags = fctx.flags()
1828 2b80c01b3f58 compat: drop compatibility layer around memctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1827 diff changeset	1802 mctx = context.memfilectx(repo, fctx.path(), fctx.data(),
2b80c01b3f58 compat: drop compatibility layer around memctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1827 diff changeset	1803 islink='l' in flags,
2b80c01b3f58 compat: drop compatibility layer around memctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1827 diff changeset	1804 isexec='x' in flags,
2b80c01b3f58 compat: drop compatibility layer around memctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1827 diff changeset	1805 copied=copied.get(path))
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1806 return mctx
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1807 return None
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1808 text = 'bumped update to %s:\n\n' % prec
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1809 text += bumped.description()
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1810
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1811 new = context.memctx(repo,
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1812 parents=[prec.node(), node.nullid],
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1813 text=text,
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1814 files=files,
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1815 filectxfn=filectxfn,
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1816 user=bumped.user(),
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1817 date=bumped.date(),
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1818 extra=bumped.extra())
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1819
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1820 newid = repo.commitctx(new)
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1821 if newid is None:
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1822 obsolete.createmarkers(repo, [(tmpctx, ())])
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1823 newid = prec.node()
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1824 else:
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1825 phases.retractboundary(repo, tr, bumped.phase(), [newid])
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1826 obsolete.createmarkers(repo, [(tmpctx, (repo[newid],))],
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1827 flag=obsolete.bumpedfix)
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1828 bmupdate(newid)
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1829 repo.ui.status(_('committed as %s\n') % node.short(newid))
1021 200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1830 # reroute the working copy parent to the new changeset
2465 479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	1831 with repo.dirstate.parentchange():
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	1832 repo.dirstate.setparents(newid, node.nullid)
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1833
1047 d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1834 def _solvedivergent(ui, repo, divergent, dryrun=False, confirm=False,
d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1835 progresscb=None):
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1836 repo = repo.unfiltered()
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1837 divergent = repo[divergent.rev()]
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1838 base, others = divergentdata(divergent)
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1839 if len(others) > 1:
760 bbb3a0e1dfea evolve: add more details when we abort for case not handled yet Pierre-Yves David <pierre-yves.david@fb.com> parents: 757 diff changeset	1840 othersstr = "[%s]" % (','.join([str(i) for i in others]))
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1841 msg = _("skipping %d:divergent with a changeset that got splitted"
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1842 " into multiple ones:\n"
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1843 "\|[%s]\n"
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1844 "\| This is not handled by automatic evolution yet\n"
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1845 "\| You have to fallback to manual handling with commands "
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1846 "such as:\n"
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1847 "\| - hg touch -D\n"
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1848 "\| - hg prune\n"
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1849 "\| \n"
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1850 "\| You should contact your local evolution Guru for help.\n"
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1851 ) % (divergent, othersstr)
1412 8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1852 ui.write_err(msg)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1853 return 2
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1854 other = others[0]
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1855 if len(other.parents()) > 1:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1856 msg = _("skipping %s: divergent changeset can't be "
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1857 "a merge (yet)\n") % divergent
1412 8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1858 ui.write_err(msg)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1859 hint = _("You have to fallback to solving this by hand...\n"
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1860 "\| This probably means redoing the merge and using \n"
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1861 "\| `hg prune` to kill older version.\n")
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1862 ui.write_err(hint)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1863 return 2
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1864 if other.p1() not in divergent.parents():
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1865 msg = _("skipping %s: have a different parent than %s "
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1866 "(not handled yet)\n") % (divergent, other)
1412 8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1867 hint = _("\| %(d)s, %(o)s are not based on the same changeset.\n"
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1868 "\| With the current state of its implementation, \n"
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1869 "\| evolve does not work in that case.\n"
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1870 "\| rebase one of them next to the other and run \n"
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1871 "\| this command again.\n"
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1872 "\| - either: hg rebase --dest 'p1(%(d)s)' -r %(o)s\n"
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1873 "\| - or: hg rebase --dest 'p1(%(o)s)' -r %(d)s\n"
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1874 ) % {'d': divergent, 'o': other}
1412 8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1875 ui.write_err(msg)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1876 ui.write_err(hint)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1877 return 2
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1878
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1879 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
1047 d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1880 if not ui.quiet or confirm:
1046 296d48e1f55a evolve: gather evolve output together Pierre-Yves David <pierre-yves.david@fb.com> parents: 1045 diff changeset	1881 ui.write(_('merge:'))
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1882 displayer.show(divergent)
1046 296d48e1f55a evolve: gather evolve output together Pierre-Yves David <pierre-yves.david@fb.com> parents: 1045 diff changeset	1883 ui.write(_('with: '))
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1884 displayer.show(other)
1046 296d48e1f55a evolve: gather evolve output together Pierre-Yves David <pierre-yves.david@fb.com> parents: 1045 diff changeset	1885 ui.write(_('base: '))
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1886 displayer.show(base)
1498 3d9a546dcbc5 evolve: annotate translatable strings with _() timeless@mozdev.org parents: 1497 diff changeset	1887 if confirm and ui.prompt(_('perform evolve? [Ny]'), 'n') != 'y':
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1888 raise error.Abort(_('evolve aborted by user'))
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1889 if dryrun:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1890 ui.write(('hg update -c %s &&\n' % divergent))
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1891 ui.write(('hg merge %s &&\n' % other))
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1892 ui.write(('hg commit -m "auto merge resolving conflict between '
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1893 '%s and %s"&&\n' % (divergent, other)))
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1894 ui.write(('hg up -C %s &&\n' % base))
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1895 ui.write(('hg revert --all --rev tip &&\n'))
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1896 ui.write(('hg commit -m "`hg log -r %s --template={desc}`";\n'
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1897 % divergent))
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1898 return
1021 200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1899 if divergent not in repo[None].parents():
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1900 repo.ui.status(_('updating to "local" conflict\n'))
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1901 hg.update(repo, divergent.rev())
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1902 repo.ui.note(_('merging divergent changeset\n'))
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1903 if progresscb:
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1904 progresscb()
1831 0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	1905 stats = merge.update(repo,
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	1906 other.node(),
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	1907 branchmerge=True,
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	1908 force=False,
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	1909 ancestor=base.node(),
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	1910 mergeancestor=True)
1021 200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1911 hg._showstats(repo, stats)
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1912 if stats[3]:
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1913 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
1755 6c78a5470583 evolve: prefer "abort" over "abandon" in messages for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 1747 diff changeset	1914 "or 'hg update -C .' to abort\n"))
1021 200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1915 if stats[3] > 0:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1916 raise error.Abort('merge conflict between several amendments '
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1917 '(this is not automated yet)',
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1918 hint="""/!\ You can try:
534 45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1919 /!\ * manual merge + resolve => new cset X
45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1920 /!\ * hg up to the parent of the amended changeset (which are named W and Z)
45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1921 /!\ * hg revert --all -r X
45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1922 /!\ * hg ci -m "same message as the amended changeset" => new cset Y
1631 7463f5880ce9 prune: remove the kill alias Pierre-Yves David <pierre-yves.david@fb.com> parents: 1630 diff changeset	1923 /!\ * hg prune -n Y W Z
534 45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1924 """)
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1925 if progresscb:
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1926 progresscb()
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1532 diff changeset	1927 emtpycommitallowed = repo.ui.backupconfig('ui', 'allowemptycommit')
1593 2f117c299325 evolve: remove meaningless transaction nesting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 1592 diff changeset	1928 tr = repo.currenttransaction()
2f117c299325 evolve: remove meaningless transaction nesting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 1592 diff changeset	1929 assert tr is not None
1021 200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1930 try:
1636 13f830540a14 config: report evolve as origin for config timeless@gmail.com parents: 1635 diff changeset	1931 repo.ui.setconfig('ui', 'allowemptycommit', True, 'evolve')
2465 479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	1932 with repo.dirstate.parentchange():
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	1933 repo.dirstate.setparents(divergent.node(), node.nullid)
1021 200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1934 oldlen = len(repo)
2772 394b836e475b commands: rewrite the 'evocommands' module to 'cmdrewrite' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2766 diff changeset	1935 cmdrewrite.amend(ui, repo, message='', logfile='')
1021 200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1936 if oldlen == len(repo):
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1937 new = divergent
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1938 # no changes
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1939 else:
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1940 new = repo['.']
1070 527b12a59628 drop relevant marker compat Pierre-Yves David <pierre-yves.david@fb.com> parents: 1069 diff changeset	1941 obsolete.createmarkers(repo, [(other, (new,))])
1069 356552e55489 evolve: always use the transaction version of phase movement Pierre-Yves David <pierre-yves.david@fb.com> parents: 1068 diff changeset	1942 phases.retractboundary(repo, tr, other.phase(), [new.node()])
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1943 finally:
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1532 diff changeset	1944 repo.ui.restoreconfig(emtpycommitallowed)
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1945
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1946 def divergentdata(ctx):
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1947 """return base, other part of a conflict
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1948
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1949 This only return the first one.
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1950
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1951 XXX this woobly function won't survive XXX
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1952 """
1375 9e062e6598e9 evolve: search divergence within all precursors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1374 diff changeset	1953 repo = ctx._repo.unfiltered()
9e062e6598e9 evolve: search divergence within all precursors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1374 diff changeset	1954 for base in repo.set('reverse(allprecursors(%d))', ctx):
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	1955 newer = compat.successorssets(ctx._repo, base.node())
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1956 # drop filter and solution including the original ctx
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1957 newer = [n for n in newer if n and ctx.node() not in n]
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1958 if newer:
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1959 return base, tuple(ctx._repo[o] for o in newer[0])
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1960 raise error.Abort("base of divergent changeset %s not found" % ctx,
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	1961 hint='this case is not yet handled')
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1962
2745 b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	1963 def _gettopic(ctx):
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	1964 """handle topic fetching with or without the extension"""
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	1965 return getattr(ctx, 'topic', lambda: '')()
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	1966
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	1967 def _gettopicidx(ctx):
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	1968 """handle topic fetching with or without the extension"""
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	1969 return getattr(ctx, 'topicidx', lambda: None)()
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	1970
2742 64fb1a082f58 prev: add '_getcurrenttopic' helper and use it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2741 diff changeset	1971 def _getcurrenttopic(repo):
64fb1a082f58 prev: add '_getcurrenttopic' helper and use it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2741 diff changeset	1972 return getattr(repo, 'currenttopic', '')
64fb1a082f58 prev: add '_getcurrenttopic' helper and use it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2741 diff changeset	1973
2736 3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1974 def _prevupdate(repo, displayer, target, bookmark, dryrun):
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1975 if dryrun:
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1976 repo.ui.write(('hg update %s;\n' % target.rev()))
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1977 if bookmark is not None:
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1978 repo.ui.write(('hg bookmark %s -r %s;\n'
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1979 % (bookmark, target.rev())))
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1980 else:
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1981 ret = hg.update(repo, target.rev())
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1982 if not ret:
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1983 tr = lock = None
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1984 try:
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1985 lock = repo.lock()
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1986 tr = repo.transaction('previous')
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1987 if bookmark is not None:
2752 4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	1988 bmchanges = [(bookmark, target.node())]
4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	1989 compat.bookmarkapplychanges(repo, tr, bmchanges)
2736 3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1990 else:
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1991 bookmarksmod.deactivate(repo)
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1992 tr.close()
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1993 finally:
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1994 lockmod.release(tr, lock)
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1995
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1996 displayer.show(target)
2739 7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	1997
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	1998 def _findprevtarget(repo, displayer, movebookmark=False, topic=True):
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	1999 target = bookmark = None
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2000 wkctx = repo[None]
2741 51d669b16fa8 prev: explicitly use 'p1' as a variable name Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2739 diff changeset	2001 p1 = wkctx.parents()[0]
51d669b16fa8 prev: explicitly use 'p1' as a variable name Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2739 diff changeset	2002 parents = p1.parents()
2742 64fb1a082f58 prev: add '_getcurrenttopic' helper and use it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2741 diff changeset	2003 currenttopic = _getcurrenttopic(repo)
2745 b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	2004
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	2005 # we do not filter in the 1 case to allow prev to t0
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	2006 if currenttopic and topic and _gettopicidx(p1) != 1:
2739 7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2007 parents = [ctx for ctx in parents if ctx.topic() == currenttopic]
2741 51d669b16fa8 prev: explicitly use 'p1' as a variable name Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2739 diff changeset	2008
51d669b16fa8 prev: explicitly use 'p1' as a variable name Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2739 diff changeset	2009 # issue message for the various case
51d669b16fa8 prev: explicitly use 'p1' as a variable name Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2739 diff changeset	2010 if p1.node() == node.nullid:
2739 7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2011 repo.ui.warn(_('already at repository root\n'))
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2012 elif not parents and currenttopic:
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2013 repo.ui.warn(_('no parent in topic "%s"\n') % currenttopic)
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2014 repo.ui.warn(_('(do you want --no-topic)\n'))
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2015 elif len(parents) == 1:
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2016 target = parents[0]
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2017 bookmark = None
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2018 if movebookmark:
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2019 bookmark = repo._activebookmark
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2020 else:
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2021 for p in parents:
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2022 displayer.show(p)
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2023 repo.ui.warn(_('multiple parents, explicitly update to one\n'))
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2024 return target, bookmark
2736 3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	2025
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2026 @eh.command(
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2027 '^previous',
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2028 [('B', 'move-bookmark', False,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2029 _('move active bookmark after update')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2030 ('', 'merge', False, _('bring uncommitted change along')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2031 ('', 'no-topic', False, _('ignore topic and move topologically')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2032 ('n', 'dry-run', False,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2033 _('do not perform actions, just print what would be done'))],
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2034 '[OPTION]...')
1160 e29a813f6af5 Make next/prev only move bookmarks optionally Ryan McElroy <rmcelroy@fb.com> parents: 1157 diff changeset	2035 def cmdprevious(ui, repo, **opts):
1572 44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2036 """update to parent revision
44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2037
44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2038 Displays the summary line of the destination for clarity."""
1742 970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2039 wlock = None
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2040 dryrunopt = opts['dry_run']
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2041 if not dryrunopt:
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2042 wlock = repo.wlock()
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2043 try:
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2044 wkctx = repo[None]
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2045 wparents = wkctx.parents()
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2046 if len(wparents) != 1:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2047 raise error.Abort('merge in progress')
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2048 if not opts['merge']:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2049 try:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2050 cmdutil.bailifchanged(repo)
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2051 except error.Abort as exc:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2052 exc.hint = _('do you want --merge?')
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2053 raise
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2054
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2055 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
2743 2fe562f94ead prev: retrieve the 'no-topic' result is a clear and reusable option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2742 diff changeset	2056 topic = not opts.get("no_topic", False)
2739 7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2057
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2058 target, bookmark = _findprevtarget(repo, displayer,
2743 2fe562f94ead prev: retrieve the 'no-topic' result is a clear and reusable option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2742 diff changeset	2059 opts.get('move_bookmark'), topic)
2739 7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2060 if target is not None:
2795 0dc119ed06b4 compat: avoid using configoveride Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2782 diff changeset	2061 backup = repo.ui.backupconfig('_internal', 'keep-topic')
0dc119ed06b4 compat: avoid using configoveride Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2782 diff changeset	2062 try:
0dc119ed06b4 compat: avoid using configoveride Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2782 diff changeset	2063 if topic and _getcurrenttopic(repo) != _gettopic(target):
0dc119ed06b4 compat: avoid using configoveride Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2782 diff changeset	2064 repo.ui.setconfig('_internal', 'keep-topic', 'yes',
0dc119ed06b4 compat: avoid using configoveride Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2782 diff changeset	2065 source='topic-extension')
2745 b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	2066 _prevupdate(repo, displayer, target, bookmark, dryrunopt)
2795 0dc119ed06b4 compat: avoid using configoveride Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2782 diff changeset	2067 finally:
0dc119ed06b4 compat: avoid using configoveride Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2782 diff changeset	2068 repo.ui.restoreconfig(backup)
2739 7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2069 return 0
1500 b4dfafda72c2 next: add support for --dry-run timeless@mozdev.org parents: 1499 diff changeset	2070 else:
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2071 return 1
1742 970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2072 finally:
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2073 lockmod.release(wlock)
127 7e113963f2c8 Add gup and gdown command to mimic qpop and qpush command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 119 diff changeset	2074
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2075 @eh.command(
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2076 '^next',
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2077 [('B', 'move-bookmark', False,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2078 _('move active bookmark after update')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2079 ('', 'merge', False, _('bring uncommitted change along')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2080 ('', 'evolve', False, _('evolve the next changeset if necessary')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2081 ('', 'no-topic', False, _('ignore topic and move topologically')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2082 ('n', 'dry-run', False,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2083 _('do not perform actions, just print what would be done'))],
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2084 '[OPTION]...')
1160 e29a813f6af5 Make next/prev only move bookmarks optionally Ryan McElroy <rmcelroy@fb.com> parents: 1157 diff changeset	2085 def cmdnext(ui, repo, **opts):
1572 44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2086 """update to next child revision
44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2087
44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2088 Use the ``--evolve`` flag to evolve unstable children on demand.
44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2089
44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2090 Displays the summary line of the destination for clarity.
44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2091 """
1742 970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2092 wlock = None
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2093 dryrunopt = opts['dry_run']
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2094 if not dryrunopt:
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2095 wlock = repo.wlock()
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2096 try:
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2097 wkctx = repo[None]
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2098 wparents = wkctx.parents()
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2099 if len(wparents) != 1:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2100 raise error.Abort('merge in progress')
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2101 if not opts['merge']:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2102 try:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2103 cmdutil.bailifchanged(repo)
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2104 except error.Abort as exc:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2105 exc.hint = _('do you want --merge?')
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2106 raise
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2107
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2108 children = [ctx for ctx in wparents[0].children() if not ctx.obsolete()]
2803 843311b8876e next: use the utility to retrieve the current topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2795 diff changeset	2109 topic = _getcurrenttopic(repo)
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2110 filtered = []
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2111 if topic and not opts.get("no_topic", False):
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2112 filtered = [ctx for ctx in children if ctx.topic() != topic]
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2113 # XXX N-square membership on children
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2114 children = [ctx for ctx in children if ctx not in filtered]
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2115 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2116 if len(children) == 1:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2117 c = children[0]
1835 93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	2118 bm = repo._activebookmark
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2119 shouldmove = opts.get('move_bookmark') and bm is not None
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2120 if dryrunopt:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2121 ui.write(('hg update %s;\n' % c.rev()))
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2122 if shouldmove:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2123 ui.write(('hg bookmark %s -r %s;\n' % (bm, c.rev())))
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2124 else:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2125 ret = hg.update(repo, c.rev())
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2126 if not ret:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2127 lock = tr = None
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2128 try:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2129 lock = repo.lock()
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2130 tr = repo.transaction('next')
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2131 if shouldmove:
2752 4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2132 bmchanges = [(bm, c.node())]
4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2133 compat.bookmarkapplychanges(repo, tr, bmchanges)
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2134 else:
1835 93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	2135 bookmarksmod.deactivate(repo)
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2136 tr.close()
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2137 finally:
1742 970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2138 lockmod.release(tr, lock)
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2139 displayer.show(c)
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2140 result = 0
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2141 elif children:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2142 ui.warn(_("ambigious next changeset:\n"))
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2143 for c in children:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2144 displayer.show(c)
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2145 ui.warn(_('explicitly update to one of them\n'))
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2146 result = 1
1500 b4dfafda72c2 next: add support for --dry-run timeless@mozdev.org parents: 1499 diff changeset	2147 else:
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2148 aspchildren = _aspiringchildren(repo, [repo['.'].rev()])
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2149 if topic:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2150 filtered.extend(repo[c] for c in children
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2151 if repo[c].topic() != topic)
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2152 # XXX N-square membership on children
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2153 aspchildren = [ctx for ctx in aspchildren if ctx not in filtered]
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2154 if not opts['evolve'] or not aspchildren:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2155 if filtered:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2156 ui.warn(_('no children on topic "%s"\n') % topic)
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2157 ui.warn(_('do you want --no-topic\n'))
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2158 else:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2159 ui.warn(_('no children\n'))
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2160 if aspchildren:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2161 msg = _('(%i unstable changesets to be evolved here, '
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2162 'do you want --evolve?)\n')
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2163 ui.warn(msg % len(aspchildren))
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2164 result = 1
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2165 elif 1 < len(aspchildren):
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2166 ui.warn(_("ambigious next (unstable) changeset:\n"))
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2167 for c in aspchildren:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2168 displayer.show(repo[c])
1756 a7dcfff8c4a9 evolve: use single quotes in usage messages Martin von Zweigbergk <martinvonz@google.com> parents: 1755 diff changeset	2169 ui.warn(_("(run 'hg evolve --rev REV' on one of them)\n"))
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2170 return 1
1628 db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	2171 else:
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2172 cmdutil.bailifchanged(repo)
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2173 result = _solveone(ui, repo, repo[aspchildren[0]], dryrunopt,
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2803 diff changeset	2174 False, lambda: None, category='orphan')
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2175 if not result:
2405 4ff849709fea label: add a label for the node in the "wc now at" message Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	2176 ui.status(_('working directory now at %s\n')
2443 6a23a55f77d2 next: prevent a color related crash when evolve Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2442 diff changeset	2177 % ui.label(str(repo['.']), 'evolve.node'))
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2178 return result
1449 9be1cadf7a07 next: add a --evolve option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1448 diff changeset	2179 return 1
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2180 return result
1742 970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2181 finally:
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2182 lockmod.release(wlock)
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	2183
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2184 @eh.wrapcommand('commit')
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	2185 def commitwrapper(orig, ui, repo, arg, *kwargs):
1558 4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2186 tr = None
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2187 if kwargs.get('amend', False):
1255 a2d4901e211e commit: avoid potential deadlock Pierre-Yves David <pierre-yves.david@fb.com> parents: 1253 diff changeset	2188 wlock = lock = None
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2189 else:
1255 a2d4901e211e commit: avoid potential deadlock Pierre-Yves David <pierre-yves.david@fb.com> parents: 1253 diff changeset	2190 wlock = repo.wlock()
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2191 lock = repo.lock()
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2192 try:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2193 obsoleted = kwargs.get('obsolete', [])
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2194 if obsoleted:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2195 obsoleted = repo.set('%lr', obsoleted)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2196 result = orig(ui, repo, arg, *kwargs)
1659 c450d134aac4 Spelling: succeeded timeless@gmail.com parents: 1646 diff changeset	2197 if not result: # commit succeeded
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2198 new = repo['-1']
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2199 oldbookmarks = []
444 aedb6b8ace86 drop repo.addobsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	2200 markers = []
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2201 for old in obsoleted:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2202 oldbookmarks.extend(repo.nodebookmarks(old.node()))
444 aedb6b8ace86 drop repo.addobsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	2203 markers.append((old, (new,)))
aedb6b8ace86 drop repo.addobsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	2204 if markers:
1070 527b12a59628 drop relevant marker compat Pierre-Yves David <pierre-yves.david@fb.com> parents: 1069 diff changeset	2205 obsolete.createmarkers(repo, markers)
2752 4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2206 bmchanges = []
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2207 for book in oldbookmarks:
2752 4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2208 bmchanges.append((book, new.node()))
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2209 if oldbookmarks:
1558 4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2210 if not wlock:
4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2211 wlock = repo.wlock()
4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2212 if not lock:
4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2213 lock = repo.lock()
4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2214 tr = repo.transaction('commit')
2752 4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2215 compat.bookmarkapplychanges(repo, tr, bmchanges)
1558 4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2216 tr.close()
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2217 return result
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2218 finally:
1558 4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2219 lockmod.release(tr, lock, wlock)
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	2220
1220 71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2221 @eh.wrapcommand('strip', extension='strip', opts=[
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2222 ('', 'bundle', None, _("delete the commit entirely and move it to a "
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	2223 "backup bundle")),
1220 71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2224 ])
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2225 def stripwrapper(orig, ui, repo, revs, *kwargs):
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2226 if (not ui.configbool('experimental', 'prunestrip') or
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2227 kwargs.get('bundle', False)):
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2228 return orig(ui, repo, revs, *kwargs)
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2229
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2230 if kwargs.get('force'):
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2231 ui.warn(_("warning: --force has no effect during strip with evolve "
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2232 "enabled\n"))
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2233 if kwargs.get('no_backup', False):
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2234 ui.warn(_("warning: --no-backup has no effect during strips with "
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2235 "evolve enabled\n"))
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2236
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2237 revs = list(revs) + kwargs.pop('rev', [])
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2238 revs = set(scmutil.revrange(repo, revs))
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2239 revs = repo.revs("(%ld)::", revs)
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2240 kwargs['rev'] = []
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2241 kwargs['new'] = []
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2242 kwargs['succ'] = []
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2243 kwargs['biject'] = False
2772 394b836e475b commands: rewrite the 'evocommands' module to 'cmdrewrite' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2766 diff changeset	2244 return cmdrewrite.cmdprune(ui, repo, revs, *kwargs)
1220 71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2245
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2246 @eh.wrapcommand('graft')
117 438fe133b068 Add a -o and -O option to graft. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 116 diff changeset	2247 def graftwrapper(orig, ui, repo, revs, *kwargs):
419 03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 410 diff changeset	2248 kwargs = dict(kwargs)
03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 410 diff changeset	2249 revs = list(revs) + kwargs.get('rev', [])
03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 410 diff changeset	2250 kwargs['rev'] = []
417 a1fb18ad29a1 evolve: avoid duplication in graft wrapper Patrick Mezard <patrick@mezard.eu> parents: 416 diff changeset	2251 obsoleted = kwargs.setdefault('obsolete', [])
419 03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 410 diff changeset	2252
1256 f8cb01637e75 graft: avoid potential deadlock Pierre-Yves David <pierre-yves.david@fb.com> parents: 1255 diff changeset	2253 wlock = lock = None
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	2254 try:
1256 f8cb01637e75 graft: avoid potential deadlock Pierre-Yves David <pierre-yves.david@fb.com> parents: 1255 diff changeset	2255 wlock = repo.wlock()
f8cb01637e75 graft: avoid potential deadlock Pierre-Yves David <pierre-yves.david@fb.com> parents: 1255 diff changeset	2256 lock = repo.lock()
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	2257 if kwargs.get('old_obsolete'):
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 417 diff changeset	2258 if kwargs.get('continue'):
2051 74934195747b evolve: switch away from deprecated repo.opener Martin von Zweigbergk <martinvonz@google.com> parents: 2049 diff changeset	2259 obsoleted.extend(repo.vfs.read('graftstate').splitlines())
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	2260 else:
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	2261 obsoleted.extend(revs)
151 e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	2262 # convert obsolete target into revs to avoid alias joke
e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	2263 obsoleted[:] = [str(i) for i in repo.revs('%lr', obsoleted)]
e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	2264 if obsoleted and len(revs) > 1:
e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	2265
743 af74a5cdf96b conform to the Mercurial custom of lowercase messages Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 742 diff changeset	2266 raise error.Abort(_('cannot graft multiple revisions while '
151 e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	2267 'obsoleting (for now).'))
e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	2268
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	2269 return commitwrapper(orig, ui, repo, revs, *kwargs)
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	2270 finally:
1256 f8cb01637e75 graft: avoid potential deadlock Pierre-Yves David <pierre-yves.david@fb.com> parents: 1255 diff changeset	2271 lockmod.release(lock, wlock)
117 438fe133b068 Add a -o and -O option to graft. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 116 diff changeset	2272
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2273 @eh.extsetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2274 def oldevolveextsetup(ui):
1631 7463f5880ce9 prune: remove the kill alias Pierre-Yves David <pierre-yves.david@fb.com> parents: 1630 diff changeset	2275 for cmd in ['prune', 'uncommit', 'touch', 'fold']:
1226 901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	2276 try:
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	2277 entry = extensions.wrapcommand(cmdtable, cmd,
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	2278 warnobserrors)
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	2279 except error.UnknownCommand:
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	2280 # Commands may be disabled
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	2281 continue
356 56d4c6207ef9 Move obserror warning into the obsolete extension. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 355 diff changeset	2282
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2283 entry = cmdutil.findcmd('commit', commands.table)[1]
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	2284 entry[1].append(('o', 'obsolete', [],
1008 a010ba5a0ffb evolve: deprecated --obsolete and --old-obsolete option on commit and graft Pierre-Yves David <pierre-yves.david@fb.com> parents: 1007 diff changeset	2285 _("make commit obsolete this revision (DEPRECATED)")))
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2286 entry = cmdutil.findcmd('graft', commands.table)[1]
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	2287 entry[1].append(('o', 'obsolete', [],
1008 a010ba5a0ffb evolve: deprecated --obsolete and --old-obsolete option on commit and graft Pierre-Yves David <pierre-yves.david@fb.com> parents: 1007 diff changeset	2288 _("make graft obsoletes this revision (DEPRECATED)")))
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	2289 entry[1].append(('O', 'old-obsolete', False,
1008 a010ba5a0ffb evolve: deprecated --obsolete and --old-obsolete option on commit and graft Pierre-Yves David <pierre-yves.david@fb.com> parents: 1007 diff changeset	2290 _("make graft obsoletes its source (DEPRECATED)")))
211 69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	2291
1302 ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2292 @eh.wrapfunction(obsolete, '_checkinvalidmarkers')
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2293 def _checkinvalidmarkers(orig, markers):
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2294 """search for marker with invalid data and raise error if needed
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2295
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2296 Exist as a separated function to allow the evolve extension for a more
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2297 subtle handling.
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2298 """
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2299 if 'debugobsconvert' in sys.argv:
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2300 return
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2301 for mark in markers:
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2302 if node.nullid in mark[1]:
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	2303 msg = _('bad obsolescence marker detected: invalid successors nullid')
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	2304 hint = _('You should run `hg debugobsconvert`')
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	2305 raise error.Abort(msg, hint=hint)
1202 4099b087f672 evolve: handle invalid obsmarkers in the `debugobsconvert` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1198 diff changeset	2306
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2307 @eh.command(
1159 04bd66779a1f obsup: hack extension to make in-place upgrading of obsolete markers easy Augie Fackler <raf@durin42.com> parents: 1157 diff changeset	2308 'debugobsconvert',
2053 f3765c4a352a exchange: rename the module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2051 diff changeset	2309 [('', 'new-format', obsexchange._bestformat, _('Destination format for markers.'))],
1159 04bd66779a1f obsup: hack extension to make in-place upgrading of obsolete markers easy Augie Fackler <raf@durin42.com> parents: 1157 diff changeset	2310 '')
04bd66779a1f obsup: hack extension to make in-place upgrading of obsolete markers easy Augie Fackler <raf@durin42.com> parents: 1157 diff changeset	2311 def debugobsconvert(ui, repo, new_format):
1507 6f574c76c142 debugobsconvert: make sure obsstore is loaded before version comparison Yuya Nishihara <yuya@tcha.org> parents: 1506 diff changeset	2312 origmarkers = repo.obsstore._all # settle version
1159 04bd66779a1f obsup: hack extension to make in-place upgrading of obsolete markers easy Augie Fackler <raf@durin42.com> parents: 1157 diff changeset	2313 if new_format == repo.obsstore._version:
04bd66779a1f obsup: hack extension to make in-place upgrading of obsolete markers easy Augie Fackler <raf@durin42.com> parents: 1157 diff changeset	2314 msg = _('New format is the same as the old format, not upgrading!')
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2315 raise error.Abort(msg)
2748 723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2316 with repo.lock():
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2317 f = repo.svfs('obsstore', 'wb', atomictemp=True)
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2318 known = set()
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2319 markers = []
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2320 for m in origmarkers:
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2321 # filter out invalid markers
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2322 if nullid in m[1]:
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2323 m = list(m)
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2324 m[1] = tuple(s for s in m[1] if s != nullid)
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2325 m = tuple(m)
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2326 if m in known:
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2327 continue
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2328 known.add(m)
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2329 markers.append(m)
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2330 ui.write(_('Old store is version %d, will rewrite in version %d\n') % (
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2331 repo.obsstore._version, new_format))
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2332 map(f.write, obsolete.encodemarkers(markers, True, new_format))
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	2333 f.close()
1159 04bd66779a1f obsup: hack extension to make in-place upgrading of obsolete markers easy Augie Fackler <raf@durin42.com> parents: 1157 diff changeset	2334 ui.write(_('Done!\n'))
04bd66779a1f obsup: hack extension to make in-place upgrading of obsolete markers easy Augie Fackler <raf@durin42.com> parents: 1157 diff changeset	2335
864 401da1b38cca discovery: implement a discovery process and use it for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 863 diff changeset	2336
1827 15ec53d46f44 compat: drop handling of ancestral 'helploader' caller Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1826 diff changeset	2337 def _helploader(ui):
1414 4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	2338 return help.gettext(evolutionhelptext)
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	2339
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	2340 @eh.uisetup
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	2341 def _setuphelp(ui):
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	2342 for entry in help.helptable:
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	2343 if entry[0] == "evolution":
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	2344 break
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	2345 else:
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	2346 help.helptable.append((["evolution"], _("Safely Rewriting History"),
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	2347 _helploader))
1414 4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	2348 help.helptable.sort()
1567 536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2349
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2350 def _relocatecommit(repo, orig, commitmsg):
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2351 if commitmsg is None:
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2352 commitmsg = orig.description()
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2353 extra = dict(orig.extra())
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2354 if 'branch' in extra:
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2355 del extra['branch']
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2356 extra['rebase_source'] = orig.hex()
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2357
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2358 backup = repo.ui.backupconfig('phases', 'new-commit')
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2359 try:
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2360 targetphase = max(orig.phase(), phases.draft)
1636 13f830540a14 config: report evolve as origin for config timeless@gmail.com parents: 1635 diff changeset	2361 repo.ui.setconfig('phases', 'new-commit', targetphase, 'evolve')
1567 536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2362 # Commit might fail if unresolved files exist
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2363 nodenew = repo.commit(text=commitmsg, user=orig.user(),
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2364 date=orig.date(), extra=extra)
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2365 finally:
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2366 repo.ui.restoreconfig(backup)
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	2367 return nodenew
1568 52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2368
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2369 def _finalizerelocate(repo, orig, dest, nodenew, tr):
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2370 destbookmarks = repo.nodebookmarks(dest.node())
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2371 nodesrc = orig.node()
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2372 destphase = repo[nodesrc].phase()
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2373 oldbookmarks = repo.nodebookmarks(nodesrc)
2752 4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2374 bmchanges = []
4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2375
1568 52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2376 if nodenew is not None:
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2377 phases.retractboundary(repo, tr, destphase, [nodenew])
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2378 obsolete.createmarkers(repo, [(repo[nodesrc], (repo[nodenew],))])
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2379 for book in oldbookmarks:
2752 4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2380 bmchanges.append((book, nodenew))
1568 52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2381 else:
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2382 obsolete.createmarkers(repo, [(repo[nodesrc], ())])
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2383 # Behave like rebase, move bookmarks to dest
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2384 for book in oldbookmarks:
2752 4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2385 bmchanges.append((book, dest.node()))
1568 52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	2386 for book in destbookmarks: # restore bookmark that rebase move
2752 4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2387 bmchanges.append((book, dest.node()))
4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2388 if bmchanges:
4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2389 compat.bookmarkapplychanges(repo, tr, bmchanges)
1592 f157ef7b1741 evolve: extract logic to new method _evolvemerge Shusen LIU <liushusen@fb.com> parents: 1589 diff changeset	2390
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2391 evolvestateversion = 0
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2392
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2393 @eh.uisetup
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2394 def setupevolveunfinished(ui):
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2395 data = ('evolvestate', True, False, _('evolve in progress'),
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	2396 _("use 'hg evolve --continue' or 'hg update -C .' to abort"))
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2397 cmdutil.unfinishedstates.append(data)
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2398
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2399 @eh.wrapfunction(hg, 'clean')
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2400 def clean(orig, repo, args, *kwargs):
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2401 ret = orig(repo, args, *kwargs)
2070 9105c3c54045 cleanup: stop using 'repo.join' methods Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2064 diff changeset	2402 util.unlinkpath(repo.vfs.join('evolvestate'), ignoremissing=True)
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2403 return ret
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2404
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2405 def _evolvestatewrite(repo, state):
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2406 # [version]
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2407 # [type][length][content]
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2408 #
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2409 # `version` is a 4 bytes integer (handled at higher level)
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2410 # `type` is a single character, `length` is a 4 byte integer, and
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2411 # `content` is an arbitrary byte sequence of length `length`.
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2412 f = repo.vfs('evolvestate', 'w')
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2413 try:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2414 f.write(_pack('>I', evolvestateversion))
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2415 current = state['current']
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2416 key = 'C' # as in 'current'
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2417 format = '>sI%is' % len(current)
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2418 f.write(_pack(format, key, len(current), current))
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2419 finally:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2420 f.close()
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2421
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2422 def _evolvestateread(repo):
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2423 try:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2424 f = repo.vfs('evolvestate')
1677 6103f6ac8110 py3: change except from two comma to as notation timeless@gmail.com parents: 1676 diff changeset	2425 except IOError as err:
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2426 if err.errno != errno.ENOENT:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2427 raise
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2428 return None
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2429 try:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2430 versionblob = f.read(4)
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2431 if len(versionblob) < 4:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2432 repo.ui.debug('ignoring corrupted evolvestte (file contains %i bits)'
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2433 % len(versionblob))
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2434 return None
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2435 version = _unpack('>I', versionblob)[0]
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2436 if version != evolvestateversion:
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	2437 msg = _('unknown evolvestate version %i') % version
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	2438 raise error.Abort(msg, hint=_('upgrade your evolve'))
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2439 records = []
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2440 data = f.read()
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2441 off = 0
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2442 end = len(data)
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2443 while off < end:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2444 rtype = data[off]
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2445 off += 1
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2446 length = _unpack('>I', data[off:(off + 4)])[0]
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2447 off += 4
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2448 record = data[off:(off + length)]
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2449 off += length
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2450 if rtype == 't':
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2451 rtype, record = record[0], record[1:]
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2452 records.append((rtype, record))
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2453 state = {}
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2454 for rtype, rdata in records:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2455 if rtype == 'C':
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2456 state['current'] = rdata
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2457 elif rtype.lower():
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2458 repo.ui.debug('ignore evolve state record type %s' % rtype)
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2459 else:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2460 raise error.Abort(_('unknown evolvestate field type %r')
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2461 % rtype, hint=_('upgrade your evolve'))
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2462 return state
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2463 finally:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2464 f.close()
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2465
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2466 def _evolvestatedelete(repo):
2070 9105c3c54045 cleanup: stop using 'repo.join' methods Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2064 diff changeset	2467 util.unlinkpath(repo.vfs.join('evolvestate'), ignoremissing=True)
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	2468
1592 f157ef7b1741 evolve: extract logic to new method _evolvemerge Shusen LIU <liushusen@fb.com> parents: 1589 diff changeset	2469 def _evolvemerge(repo, orig, dest, pctx, keepbranch):
f157ef7b1741 evolve: extract logic to new method _evolvemerge Shusen LIU <liushusen@fb.com> parents: 1589 diff changeset	2470 """Used by the evolve function to merge dest on top of pctx.
f157ef7b1741 evolve: extract logic to new method _evolvemerge Shusen LIU <liushusen@fb.com> parents: 1589 diff changeset	2471 return the same tuple as merge.graft"""
f157ef7b1741 evolve: extract logic to new method _evolvemerge Shusen LIU <liushusen@fb.com> parents: 1589 diff changeset	2472 if repo['.'].rev() != dest.rev():
1831 0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	2473 merge.update(repo,
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	2474 dest,
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	2475 branchmerge=False,
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	2476 force=True)
1835 93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	2477 if repo._activebookmark:
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	2478 repo.ui.status(_("(leaving bookmark %s)\n") % repo._activebookmark)
1835 93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	2479 bookmarksmod.deactivate(repo)
1592 f157ef7b1741 evolve: extract logic to new method _evolvemerge Shusen LIU <liushusen@fb.com> parents: 1589 diff changeset	2480 if keepbranch:
2032 dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2024 diff changeset	2481 repo.dirstate.setbranch(orig.branch())
1627 a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	2482 if util.safehasattr(repo, 'currenttopic'):
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	2483 # uurrgs
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	2484 # there no other topic setter yet
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	2485 if not orig.topic() and repo.vfs.exists('topic'):
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	2486 repo.vfs.unlink('topic')
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	2487 else:
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	2488 with repo.vfs.open('topic', 'w') as f:
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	2489 f.write(orig.topic())
1592 f157ef7b1741 evolve: extract logic to new method _evolvemerge Shusen LIU <liushusen@fb.com> parents: 1589 diff changeset	2490
1826 19df96c0d670 compat: drop hack around a 'graft' signature change Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1825 diff changeset	2491 return merge.graft(repo, orig, pctx, ['local', 'graft'], True)

Mercurial > evolve

annotate hgext3rd/evolve/__init__.py @ 2923:8c2d3c474fc6

annotate hgext3rd/evolve/init.py @ 2923:8c2d3c474fc6