evolve: hgext3rd/evolve/__init_

annotate hgext3rd/evolve/init.py @ 2755:f690d51dfe5e

interactive: fix the interractive option import The move made in e6bc6eaa17c5 was buggy.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Sun, 23 Jul 2017 06:47:34 +0200
parents	4457aa1d81aa
children	f4dd6e6d4c73

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
26d638e419df auto-push: move config help in the extension help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2294 diff changeset	37 New Config:
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
7eff426f999b evolve: explain how to disable markers discovery in the documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2699 diff changeset	106 it back on).
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
9e84b407fde5 doc: update effect flag documentation Boris Feld <boris.feld@octobus.net> parents: 2687 diff changeset	140 changeset and you update only the message, you will see:
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
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	217 via an extension).""".strip()
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	218
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	219
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	220 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	221 import sys
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	222 import random
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	223 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	224 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	225 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	226 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	227
1676 1247d87a738d py3: tolerate io/StringIO divergence timeless@gmail.com parents: 1675 diff changeset	228 try:
1247d87a738d py3: tolerate io/StringIO divergence timeless@gmail.com parents: 1675 diff changeset	229 import StringIO as io
1247d87a738d py3: tolerate io/StringIO divergence timeless@gmail.com parents: 1675 diff changeset	230 StringIO = io.StringIO
1247d87a738d py3: tolerate io/StringIO divergence timeless@gmail.com parents: 1675 diff changeset	231 except ImportError:
1247d87a738d py3: tolerate io/StringIO divergence timeless@gmail.com parents: 1675 diff changeset	232 import io
1247d87a738d py3: tolerate io/StringIO divergence timeless@gmail.com parents: 1675 diff changeset	233 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	234
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	235
1825 377d94d6c889 evolve: proactively detect bad version early Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1824 diff changeset	236 try:
377d94d6c889 evolve: proactively detect bad version early Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1824 diff changeset	237 from mercurial import registrar
377d94d6c889 evolve: proactively detect bad version early Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1824 diff changeset	238 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	239 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	240 from . import metadata
1825 377d94d6c889 evolve: proactively detect bad version early Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1824 diff changeset	241 raise ImportError('evolve needs 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	242 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	243
670 97ce1f801309 evolve: drop unused import Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 663 diff changeset	244 import mercurial
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	245 from mercurial import util
1513 4f7e0e0318a5 prune: reuse revset from repair instead of copy-pasting code Ryan McElroy <rmcelroy@fb.com> parents: 1512 diff changeset	246 from mercurial import repair
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	247
1834 f23a97d14895 compat: drop compat for older wireproto implementation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1833 diff changeset	248 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	249 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	250 obsolete._enabled = True
617 469befc27b26 detect incompatibility with future mercurial 2.5 Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 616 diff changeset	251
1823 649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	252 from mercurial import (
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	253 bookmarks as bookmarksmod,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	254 cmdutil,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	255 commands,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	256 context,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	257 copies,
2465 479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	258 dirstate,
1823 649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	259 error,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	260 extensions,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	261 help,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	262 hg,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	263 lock as lockmod,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	264 merge,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	265 node,
2524 d912380ec685 evolve: fix import order Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2521 diff changeset	266 obsolete,
1823 649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	267 patch,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	268 phases,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	269 revset,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	270 scmutil,
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	271 )
649d7a574c3f evolve: cleanup imports Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1822 diff changeset	272
2724 e6bc6eaa17c5 amend: extract into a 'evolve.evocommands' module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2716 diff changeset	273 from mercurial.commands import commitopts, commitopts2, mergetoolopts
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	274 from mercurial.i18n import _
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	275 from mercurial.node import nullid
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	276
2041 3b6550261614 exthelper: extract into its own submodule Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2032 diff changeset	277 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	278 checkheads,
2525 5adb8bdb935e compatibility: backport mercurial 176d1a0ce385 Boris Feld <boris.feld@octobus.net> parents: 2524 diff changeset	279 compat,
2123 cf7b4ab31f0c split: move the debugcommand into a dedicated module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2122 diff changeset	280 debugcmd,
2724 e6bc6eaa17c5 amend: extract into a 'evolve.evocommands' module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2716 diff changeset	281 evocommands,
2041 3b6550261614 exthelper: extract into its own submodule Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2032 diff changeset	282 exthelper,
2049 b81d3775006b evolve: move extension metadata in their own module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2048 diff changeset	283 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	284 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	285 obsexchange,
2524 d912380ec685 evolve: fix import order Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2521 diff changeset	286 obshistory,
2286 a4c5744a7b93 safeguard: add an option to disable automatic publishing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2275 diff changeset	287 safeguard,
2524 d912380ec685 evolve: fix import order Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2521 diff changeset	288 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	289 utility,
2041 3b6550261614 exthelper: extract into its own submodule Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2032 diff changeset	290 )
3b6550261614 exthelper: extract into its own submodule Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2032 diff changeset	291
2049 b81d3775006b evolve: move extension metadata in their own module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2048 diff changeset	292 __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	293 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	294 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	295 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	296
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	297 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	298
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	299 # 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	300 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	301
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	302 obsexcmsg = utility.obsexcmsg
1838 6942750831bb serveronly: deduplicate code with the main evolve extension Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1836 diff changeset	303
2404 c07f752137f4 label: rename 'evolve.short_node' to 'evolve.node' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2403 diff changeset	304 colortable = {'evolve.node': 'yellow',
2337 c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	305 'evolve.user': 'green',
c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	306 'evolve.rev': 'blue',
c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	307 'evolve.short_description': '',
c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	308 'evolve.date': 'cyan',
c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	309 'evolve.current_rev': 'bold',
c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	310 'evolve.verb': '',
c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	311 }
c0ed4adf965e obshistory: add some color Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	312
820 a9a66143e2ec exchange: actually use _pushkeyescape fallback Pierre-Yves David <pierre-yves.david@fb.com> parents: 819 diff changeset	313 _pack = struct.pack
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	314 _unpack = struct.unpack
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	315
1296 23819e1d61fd evolve: add -i flag to amend command Laurent Charignon <lcharignon@fb.com> parents: 1281 diff changeset	316 aliases, entry = cmdutil.findcmd('commit', commands.table)
2724 e6bc6eaa17c5 amend: extract into a 'evolve.evocommands' module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2716 diff changeset	317 commitopts3 = evocommands.commitopts3
2755 f690d51dfe5e interactive: fix the interractive option import Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2752 diff changeset	318 interactiveopt = evocommands.interactiveopt
2725 4eb90eace7f9 uncommit: move to the 'evocommands' module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2724 diff changeset	319 _bookmarksupdater = evocommands._bookmarksupdater
2724 e6bc6eaa17c5 amend: extract into a 'evolve.evocommands' module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2716 diff changeset	320
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	321 # This extension contains the following code
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	322 #
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	323 # - Extension Helper code
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	324 # - Obsolescence cache
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	325 # - ...
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	326 # - Older format compat
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	327
2041 3b6550261614 exthelper: extract into its own submodule Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2032 diff changeset	328 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	329 eh.merge(debugcmd.eh)
2053 f3765c4a352a exchange: rename the module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2051 diff changeset	330 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	331 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	332 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	333 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	334 eh.merge(obshistory.eh)
2485 e6ecd35e99ec refactor: extract templates into a new file Boris Feld <boris.feld@octobus.net> parents: 2481 diff changeset	335 eh.merge(templatekw.eh)
2525 5adb8bdb935e compatibility: backport mercurial 176d1a0ce385 Boris Feld <boris.feld@octobus.net> parents: 2524 diff changeset	336 eh.merge(compat.eh)
2724 e6bc6eaa17c5 amend: extract into a 'evolve.evocommands' module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2716 diff changeset	337 eh.merge(evocommands.eh)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	338 uisetup = eh.final_uisetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	339 extsetup = eh.final_extsetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	340 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	341 cmdtable = eh.cmdtable
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	342
2465 479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	343 # pre hg 4.0 compat
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	344
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	345 if not util.safehasattr(dirstate.dirstate, 'parentchange'):
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	346 import contextlib
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	347
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	348 @contextlib.contextmanager
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	349 def parentchange(self):
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	350 '''Context manager for handling dirstate parents.
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	351
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	352 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	353 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	354 released.
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	355 '''
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	356 self._parentwriters += 1
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	357 yield
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	358 # 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	359 # 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	360 # 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	361 # 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	362 # 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	363 self._parentwriters -= 1
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	364 dirstate.dirstate.parentchange = parentchange
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	365
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	366 #####################################################################
1213 7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	367 ### Option configuration ###
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	368 #####################################################################
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	369
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	370 @eh.reposetup # must be the first of its kin.
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	371 def _configureoptions(ui, repo):
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	372 # If no capabilities are specified, enable everything.
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	373 # 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	374 evolveopts = ui.configlist('experimental', 'evolution')
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	375 if not evolveopts:
7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	376 evolveopts = ['all']
1635 91ba7e0daff6 alias: report evolve as origin for aliases timeless@gmail.com parents: 1634 diff changeset	377 ui.setconfig('experimental', 'evolution', evolveopts, 'evolve')
1213 7118996bdf43 config: enable all obsolete options Durham Goode <durham@fb.com> parents: 1212 diff changeset	378
1226 901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	379 @eh.uisetup
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	380 def _configurecmdoptions(ui):
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	381 # Unregister evolve commands if the command capability is not specified.
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	382 #
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	383 # 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	384 # guarantee it happens after the above configuration, but before the
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	385 # extsetup functions.
1441 a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	386 evolvecommands = ui.configlist('experimental', 'evolutioncommands')
1226 901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	387 evolveopts = ui.configlist('experimental', 'evolution')
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	388 if evolveopts and (commandopt not in evolveopts and
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	389 'all' not in evolveopts):
1441 a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	390 # 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	391 whitelist = set()
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	392 for cmd in evolvecommands:
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	393 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	394 if not matchingevolvecommands:
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	395 raise error.Abort(_('unknown command: %s') % cmd)
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	396 elif len(matchingevolvecommands) > 1:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	397 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	398 raise error.Abort(msg % (cmd, matchingevolvecommands))
1441 a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	399 else:
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	400 whitelist.add(matchingevolvecommands[0])
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	401 for disabledcmd in set(cmdtable) - whitelist:
a4abe588d77f evolve: mechanism to load some commands selectively Laurent Charignon <lcharignon@fb.com> parents: 1440 diff changeset	402 del cmdtable[disabledcmd]
1213 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 #####################################################################
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	405 ### 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	406 #####################################################################
66c02a2e8e2f prune: wrap mercurial internal to add parent information in prune marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 804 diff changeset	407
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	408 getrevs = obsolete.getrevs
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	409
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	410 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	411 ### Additional Utilities ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	412 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	413
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	414 # 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	415
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	416 # - Function to create markers
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	417 # - 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	418 # - "troubles" method on changectx
1661 48232457b704 Spelling: through timeless@gmail.com parents: 1659 diff changeset	419 # - 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	420 # - function to find useful changeset to stabilize
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	421
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	422
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	423 ### Useful alias
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	424
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	425 @eh.uisetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	426 def _installalias(ui):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	427 if ui.config('alias', 'pstatus', None) is None:
1635 91ba7e0daff6 alias: report evolve as origin for aliases timeless@gmail.com parents: 1634 diff changeset	428 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	429 if ui.config('alias', 'pdiff', None) is None:
1635 91ba7e0daff6 alias: report evolve as origin for aliases timeless@gmail.com parents: 1634 diff changeset	430 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	431 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	432 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	433 "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	434 'evolve')
696 121e2d265e85 alias: add a grab alias Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 695 diff changeset	435 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	436 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	437 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	438 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	439 + " 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	440 + hgexe + " up tip",
1635 91ba7e0daff6 alias: report evolve as origin for aliases timeless@gmail.com parents: 1634 diff changeset	441 'evolve')
1104 cb36a4eb0157 evolve: fix the 'grab' alias to work on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1101 diff changeset	442 else:
cb36a4eb0157 evolve: fix the 'grab' alias to work on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1101 diff changeset	443 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	444 "! $HG rebase --dest . --rev $@ && $HG up tip",
1635 91ba7e0daff6 alias: report evolve as origin for aliases timeless@gmail.com parents: 1634 diff changeset	445 'evolve')
696 121e2d265e85 alias: add a grab alias Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 695 diff changeset	446
491 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 ### Troubled revset symbol
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	449
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	450 @eh.revset('troubled')
594 7f89b31fcb26 merge bumped rename Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 592 593 diff changeset	451 def revsettroubled(repo, subset, x):
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	452 """``troubled()``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	453 Changesets with troubles.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	454 """
993 8a4a8fe50c26 evolve: do not use _ as an unused variable Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 988 diff changeset	455 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	456 troubled = set()
61849d45d47e evolve: move 'troubled()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1380 diff changeset	457 troubled.update(getrevs(repo, 'unstable'))
61849d45d47e evolve: move 'troubled()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1380 diff changeset	458 troubled.update(getrevs(repo, 'bumped'))
61849d45d47e evolve: move 'troubled()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1380 diff changeset	459 troubled.update(getrevs(repo, 'divergent'))
61849d45d47e evolve: move 'troubled()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1380 diff changeset	460 troubled = revset.baseset(troubled)
61849d45d47e evolve: move 'troubled()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1380 diff changeset	461 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	462 return subset & troubled
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	463
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	464 ### Obsolescence graph
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	465
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	466 # 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	467
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	468 def _precursors(repo, s):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	469 """Precursor of a changeset"""
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	470 cs = set()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	471 nm = repo.changelog.nodemap
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	472 markerbysubj = repo.obsstore.precursors
1377 01bdeb847f81 evolve: avoid creating changectx object in _precursors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1376 diff changeset	473 node = repo.changelog.node
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	474 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	475 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	476 pr = nm.get(p[0])
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	477 if pr is not None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	478 cs.add(pr)
1383 cf62abb62941 evolve: move 'precursors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1382 diff changeset	479 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	480 return cs
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	481
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	482 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	483 """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	484 node = repo.changelog.node
a127f0f3bf5f evolve: avoid creating changectx object in _allprecursors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1377 diff changeset	485 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	486 seen = set()
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	487 allsubjects = repo.obsstore.precursors
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	488 while toproceed:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	489 nc = toproceed.pop()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	490 for mark in allsubjects.get(nc, ()):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	491 np = mark[0]
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	492 if np not in seen:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	493 seen.add(np)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	494 toproceed.append(np)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	495 nm = repo.changelog.nodemap
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	496 cs = set()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	497 for p in seen:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	498 pr = nm.get(p)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	499 if pr is not None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	500 cs.add(pr)
1384 64c8b8c27811 evolve: move 'allprecursors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1383 diff changeset	501 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	502 return cs
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	503
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	504 def _successors(repo, s):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	505 """Successors of a changeset"""
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	506 cs = set()
1379 693cdcd809f2 evolve: avoid creating changectx object in _successors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1378 diff changeset	507 node = repo.changelog.node
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	508 nm = repo.changelog.nodemap
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	509 markerbyobj = repo.obsstore.successors
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	510 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	511 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	512 for sub in p[1]:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	513 sr = nm.get(sub)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	514 if sr is not None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	515 cs.add(sr)
1385 c2584407afbf evolve: move 'successors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1384 diff changeset	516 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	517 return cs
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	518
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	519 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	520 """transitive successors of a subset
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	521
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	522 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	523 marker. """
1380 43dcf62237be evolve: avoid creating changectx object in _allsuccessors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1379 diff changeset	524 node = repo.changelog.node
43dcf62237be evolve: avoid creating changectx object in _allsuccessors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1379 diff changeset	525 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	526 seen = set()
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	527 allobjects = repo.obsstore.successors
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	528 while toproceed:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	529 nc = toproceed.pop()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	530 for mark in allobjects.get(nc, ()):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	531 if mark[2] & haltonflags:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	532 continue
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	533 for sub in mark[1]:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	534 if sub == nullid:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	535 continue # should not be here!
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	536 if sub not in seen:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	537 seen.add(sub)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	538 toproceed.append(sub)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	539 nm = repo.changelog.nodemap
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	540 cs = set()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	541 for s in seen:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	542 sr = nm.get(s)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	543 if sr is not None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	544 cs.add(sr)
1386 b5eaec8a53d0 evolve: move 'allsuccessors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1385 diff changeset	545 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	546 return cs
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	547
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	548 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	549 ### Extending revset and template ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	550 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	551
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	552 # 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	553 # they are subject to changes
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	554
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	555
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	556 ### 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	557 @eh.revset('suspended')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	558 def revsetsuspended(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	559 """``suspended()``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	560 Obsolete changesets with non-obsolete descendants.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	561 """
1307 677c5da57b9c evolve: remove unused variables Laurent Charignon <lcharignon@fb.com> parents: 1306 diff changeset	562 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	563 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	564 suspended.sort()
c431f827f366 evolve: move 'suspended()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1381 diff changeset	565 return subset & suspended
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	566
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	567
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	568 @eh.revset('precursors')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	569 def revsetprecursors(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	570 """``precursors(set)``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	571 Immediate precursors of changesets in set.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	572 """
1204 161b8f6e7402 evolve: use 3.2+ fullreposet to evaluate argument set (issue4515) Yuya Nishihara <yuya@tcha.org> parents: 1203 diff changeset	573 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	574 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	575 s.sort()
cf62abb62941 evolve: move 'precursors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1382 diff changeset	576 return subset & s
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	577
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	578
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	579 @eh.revset('allprecursors')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	580 def revsetallprecursors(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	581 """``allprecursors(set)``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	582 Transitive precursors of changesets in set.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	583 """
1204 161b8f6e7402 evolve: use 3.2+ fullreposet to evaluate argument set (issue4515) Yuya Nishihara <yuya@tcha.org> parents: 1203 diff changeset	584 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	585 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	586 s.sort()
64c8b8c27811 evolve: move 'allprecursors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1383 diff changeset	587 return subset & s
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	588
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 @eh.revset('successors')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	591 def revsetsuccessors(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	592 """``successors(set)``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	593 Immediate successors of changesets in set.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	594 """
1204 161b8f6e7402 evolve: use 3.2+ fullreposet to evaluate argument set (issue4515) Yuya Nishihara <yuya@tcha.org> parents: 1203 diff changeset	595 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	596 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	597 s.sort()
c2584407afbf evolve: move 'successors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1384 diff changeset	598 return subset & s
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	599
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	600 @eh.revset('allsuccessors')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	601 def revsetallsuccessors(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	602 """``allsuccessors(set)``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	603 Transitive successors of changesets in set.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	604 """
1204 161b8f6e7402 evolve: use 3.2+ fullreposet to evaluate argument set (issue4515) Yuya Nishihara <yuya@tcha.org> parents: 1203 diff changeset	605 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	606 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	607 s.sort()
b5eaec8a53d0 evolve: move 'allsuccessors()' to smarted usage Pierre-Yves David <pierre-yves.david@fb.com> parents: 1385 diff changeset	608 return subset & s
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	609
1399 9ff6d9240f16 template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 949 diff changeset	610
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	611 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	612 ### Various trouble warning ###
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
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	615 # 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	616
1527 e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	617 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	618 rev = repo['.']
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	619
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	620 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	621 return
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	622
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	623 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	624 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	625
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	626 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	627
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	628 # 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	629 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	630 return
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	631
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	632 # 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	633 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	634
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	635 if reason == 'pruned':
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	636 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	637 elif reason == 'diverged':
2546 abe6dfbdc744 evolve: fix typo: -list -> --list Kyle Lippincott <spectral@google.com> parents: 2525 diff changeset	638 debugcommand = "hg evolve --list --divergent"
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	639 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	640 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	641 elif reason == 'superseed':
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	642 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	643 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	644 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	645 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	646
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	647 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	648 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	649 else:
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	650 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	651 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	652 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	653 solvemsg = msg % successorsmsg
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	654 else:
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	655 raise ValueError(reason)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	656
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 2286 diff changeset	657 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	658
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	659 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	660 # 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	661 @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	662 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	663 """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	664
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	665 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	666 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	667 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	668
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	669 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	670 rev = unfilteredrepo[changeid]
2488 1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2485 diff changeset	671 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	672
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	673 # 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	674 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	675 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	676 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	677 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	678 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	679 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	680 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	681 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	682 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	683 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	684
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	685 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	686 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	687 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	688 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	689 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	690 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	691
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	692 @eh.wrapcommand("update")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	693 @eh.wrapcommand("pull")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	694 def wrapmayobsoletewc(origfn, ui, repo, args, *opts):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	695 """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	696 def warnobsolete():
1527 e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	697 _warnobsoletewc(ui, repo)
1452 1bcbd14cf159 merge back with 3.3 compat branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	698 wlock = None
1bcbd14cf159 merge back with 3.3 compat branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	699 try:
1bcbd14cf159 merge back with 3.3 compat branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	700 wlock = repo.wlock()
1bcbd14cf159 merge back with 3.3 compat branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	701 repo._afterlock(warnobsolete)
1bcbd14cf159 merge back with 3.3 compat branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	702 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	703 finally:
1bcbd14cf159 merge back with 3.3 compat branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	704 lockmod.release(wlock)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	705 return res
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	706
1527 e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	707 @eh.wrapcommand("parents")
e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	708 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	709 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	710 _warnobsoletewc(ui, repo)
e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	711 return res
e080d2ae2656 parents: avoid locking the repository during 'hg parents' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1519 diff changeset	712
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	713 # XXX this could wrap transaction code
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	714 # 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	715 @eh.wrapcommand("commit")
763 966e2659e989 import: warn about new unstable changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 762 diff changeset	716 @eh.wrapcommand("import")
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	717 @eh.wrapcommand("push")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	718 @eh.wrapcommand("pull")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	719 @eh.wrapcommand("graft")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	720 @eh.wrapcommand("phase")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	721 @eh.wrapcommand("unbundle")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	722 def warnobserrors(orig, ui, repo, args, *kwargs):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	723 """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	724 # 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	725 # 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	726 filtered = repo.changelog.filteredrevs
2a2b8c95bb43 evolve: remove revset calls in warnobserror Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 657 diff changeset	727 priorunstables = len(set(getrevs(repo, 'unstable')) - filtered)
2a2b8c95bb43 evolve: remove revset calls in warnobserror Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 657 diff changeset	728 priorbumpeds = len(set(getrevs(repo, 'bumped')) - filtered)
2a2b8c95bb43 evolve: remove revset calls in warnobserror Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 657 diff changeset	729 priordivergents = len(set(getrevs(repo, 'divergent')) - filtered)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	730 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	731 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	732 newunstables = \
2b2a4ab0eb68 evolve: make most line lenghts 80 characters or less Angel Ezquerra <angel.ezquerra@gmail.com> parents: 948 diff changeset	733 len(set(getrevs(repo, 'unstable')) - filtered) - priorunstables
2b2a4ab0eb68 evolve: make most line lenghts 80 characters or less Angel Ezquerra <angel.ezquerra@gmail.com> parents: 948 diff changeset	734 newbumpeds = \
2b2a4ab0eb68 evolve: make most line lenghts 80 characters or less Angel Ezquerra <angel.ezquerra@gmail.com> parents: 948 diff changeset	735 len(set(getrevs(repo, 'bumped')) - filtered) - priorbumpeds
2b2a4ab0eb68 evolve: make most line lenghts 80 characters or less Angel Ezquerra <angel.ezquerra@gmail.com> parents: 948 diff changeset	736 newdivergents = \
2b2a4ab0eb68 evolve: make most line lenghts 80 characters or less Angel Ezquerra <angel.ezquerra@gmail.com> parents: 948 diff changeset	737 len(set(getrevs(repo, 'divergent')) - filtered) - priordivergents
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	738 if newunstables > 0:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	739 ui.warn(_('%i new unstable changesets\n') % newunstables)
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	740 if newbumpeds > 0:
26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	741 ui.warn(_('%i new bumped changesets\n') % newbumpeds)
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	742 if newdivergents > 0:
f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	743 ui.warn(_('%i new divergent changesets\n') % newdivergents)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	744 return ret
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	745
1122 c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	746 @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	747 def push(orig, repo, args, *opts):
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	748 """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	749 """
1122 c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	750 try:
c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	751 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	752 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	753 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	754 "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	755 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	756 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	757 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	758 ex.hint = hint
c8750f4388c8 evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea Matt Harbison <matt_harbison@yahoo.com> parents: 1120 diff changeset	759 raise
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	760
788 e973dd5bf583 evolve: register a summary hook instead of wrapping the summary command Simon Heimberg <simohe@besonet.ch> parents: 776 diff changeset	761 def summaryhook(ui, repo):
513 4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	762 def write(fmt, count):
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	763 s = fmt % count
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	764 if count:
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	765 ui.write(s)
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	766 else:
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	767 ui.note(s)
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	768
1640 bbf897714e70 evolve: add --continue note to summary timeless@gmail.com parents: 1639 diff changeset	769 state = _evolvestateread(repo)
bbf897714e70 evolve: add --continue note to summary timeless@gmail.com parents: 1639 diff changeset	770 if state is not None:
bbf897714e70 evolve: add --continue note to summary timeless@gmail.com parents: 1639 diff changeset	771 # i18n: column positioning for "hg summary"
bbf897714e70 evolve: add --continue note to summary timeless@gmail.com parents: 1639 diff changeset	772 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	773
e973dd5bf583 evolve: register a summary hook instead of wrapping the summary command Simon Heimberg <simohe@besonet.ch> parents: 776 diff changeset	774 @eh.extsetup
e973dd5bf583 evolve: register a summary hook instead of wrapping the summary command Simon Heimberg <simohe@besonet.ch> parents: 776 diff changeset	775 def obssummarysetup(ui):
e973dd5bf583 evolve: register a summary hook instead of wrapping the summary command Simon Heimberg <simohe@besonet.ch> parents: 776 diff changeset	776 cmdutil.summaryhooks.add('evolve', summaryhook)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	777
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	778
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	779 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	780 ### Core Other extension compat ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	781 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	782
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	783
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	784 @eh.extsetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	785 def _rebasewrapping(ui):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	786 # warning about more obsolete
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	787 try:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	788 rebase = extensions.find('rebase')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	789 if rebase:
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	790 extensions.wrapcommand(rebase.cmdtable, 'rebase', warnobserrors)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	791 except KeyError:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	792 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	793 try:
718262019c6f evolve: warn for troubles created by histedit too. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 677 diff changeset	794 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	795 if histedit:
718262019c6f evolve: warn for troubles created by histedit too. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 677 diff changeset	796 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	797 except KeyError:
1575 0c8548df67fe merge with stable Pierre-Yves David <pierre-yves.david@fb.com> parents: 1568 1574 diff changeset	798 pass # histedit not found
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	799
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	800 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	801 ### Old Evolve extension content ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	802 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	803
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	804 # 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	805
82 8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	806 ### changeset rewriting logic
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	807 #############################
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	808
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	809 def rewrite(repo, old, updates, head, newbases, commitopts):
265 24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	810 """Return (nodeid, created) where nodeid is the identifier of the
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	811 changeset generated by the rewrite process, and created is True if
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	812 nodeid was actually created. If created is False, nodeid
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	813 references a changeset existing before the rewrite call.
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	814 """
1506 a55c691f4cc0 evolve: use repo._bookmarks.recordchange instead of repo._bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1505 diff changeset	815 wlock = lock = tr = None
a55c691f4cc0 evolve: use repo._bookmarks.recordchange instead of repo._bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1505 diff changeset	816 try:
a55c691f4cc0 evolve: use repo._bookmarks.recordchange instead of repo._bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1505 diff changeset	817 wlock = repo.wlock()
a55c691f4cc0 evolve: use repo._bookmarks.recordchange instead of repo._bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1505 diff changeset	818 lock = repo.lock()
a55c691f4cc0 evolve: use repo._bookmarks.recordchange instead of repo._bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1505 diff changeset	819 tr = repo.transaction('rewrite')
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	820 if len(old.parents()) > 1: # XXX remove this unnecessary limitation.
1505 53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	821 raise error.Abort(_('cannot amend merge changesets'))
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	822 base = old.p1()
1506 a55c691f4cc0 evolve: use repo._bookmarks.recordchange instead of repo._bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1505 diff changeset	823 updatebookmarks = _bookmarksupdater(repo, old.node(), tr)
1505 53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	824
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	825 # commit a new version of the old changeset, including the update
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	826 # collect all files which might be affected
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	827 files = set(old.files())
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	828 for u in updates:
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	829 files.update(u.files())
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	830
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	831 # Recompute copies (avoid recording a -> b -> a)
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	832 copied = copies.pathcopies(base, head)
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	833
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	834 # prune files which were reverted by the updates
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	835 def samefile(f):
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	836 if f in head.manifest():
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	837 a = head.filectx(f)
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	838 if f in base.manifest():
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	839 b = base.filectx(f)
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	840 return (a.data() == b.data()
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	841 and a.flags() == b.flags())
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	842 else:
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	843 return False
82 8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	844 else:
1505 53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	845 return f not in base.manifest()
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	846 files = [f for f in files if not samefile(f)]
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	847 # commit version of these files as defined by head
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	848 headmf = head.manifest()
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	849
1505 53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	850 def filectxfn(repo, ctx, path):
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	851 if path in headmf:
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	852 fctx = head[path]
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	853 flags = fctx.flags()
1828 2b80c01b3f58 compat: drop compatibility layer around memctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1827 diff changeset	854 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	855 islink='l' in flags,
2b80c01b3f58 compat: drop compatibility layer around memctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1827 diff changeset	856 isexec='x' in flags,
2b80c01b3f58 compat: drop compatibility layer around memctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1827 diff changeset	857 copied=copied.get(path))
1505 53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	858 return mctx
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	859 return None
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	860
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	861 message = cmdutil.logmessage(repo.ui, commitopts)
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	862 if not message:
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	863 message = old.description()
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	864
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	865 user = commitopts.get('user') or old.user()
2481 d63f383e43b6 test: fix test-evolve.t Boris Feld <boris.feld@octobus.net> parents: 2479 diff changeset	866 # TODO: In case not date is given, we should take the old commit date
d63f383e43b6 test: fix test-evolve.t Boris Feld <boris.feld@octobus.net> parents: 2479 diff changeset	867 # if we are working one one changeset or mimic the fold behavior about
d63f383e43b6 test: fix test-evolve.t Boris Feld <boris.feld@octobus.net> parents: 2479 diff changeset	868 # date
d63f383e43b6 test: fix test-evolve.t Boris Feld <boris.feld@octobus.net> parents: 2479 diff changeset	869 date = commitopts.get('date') or None
1510 b86eea66ed02 evolve: be more complete about copying extra from old revisions Augie Fackler <raf@durin42.com> parents: 1509 diff changeset	870 extra = dict(commitopts.get('extra', old.extra()))
1505 53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	871 extra['branch'] = head.branch()
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	872
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	873 new = context.memctx(repo,
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	874 parents=newbases,
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	875 text=message,
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	876 files=files,
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	877 filectxfn=filectxfn,
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	878 user=user,
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	879 date=date,
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	880 extra=extra)
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	881
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	882 if commitopts.get('edit'):
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	883 new._text = cmdutil.commitforceeditor(repo, new, [])
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	884 revcount = len(repo)
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	885 newid = repo.commitctx(new)
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	886 new = repo[newid]
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	887 created = len(repo) != revcount
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	888 updatebookmarks(newid)
53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	889
1506 a55c691f4cc0 evolve: use repo._bookmarks.recordchange instead of repo._bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1505 diff changeset	890 tr.close()
1505 53a6dbc33e36 evolve: indentation change for making next patch more legible Laurent Charignon <lcharignon@fb.com> parents: 1504 diff changeset	891 return newid, created
1506 a55c691f4cc0 evolve: use repo._bookmarks.recordchange instead of repo._bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1505 diff changeset	892 finally:
1554 59f5bb1f1877 transaction: fix release order in 'rewrite' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1547 diff changeset	893 lockmod.release(tr, lock, wlock)
82 8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	894
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	895 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	896 pass
3f91654713dd obsolete Move merge failure handling into stabilize code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 455 diff changeset	897
1576 526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	898 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	899 """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	900 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	901 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	902 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	903 "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	904 "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	905 "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	906
1576 526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	907 if pctx is None:
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	908 if len(orig.parents()) == 2:
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	909 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	910 "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	911 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	912 pctx = orig.p1()
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	913
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	914 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	915
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	916 cache = {}
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	917 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	918 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	919 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	920 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	921 try:
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	922 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	923 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	924 continue
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	925
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	926 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	927 continue
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	928
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	929 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	930
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	931 # 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	932 # 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	933 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	934 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	935 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	936 else:
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	937 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	938 '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	939
1593 2f117c299325 evolve: remove meaningless transaction nesting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 1592 diff changeset	940 tr = repo.currenttransaction()
2f117c299325 evolve: remove meaningless transaction nesting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 1592 diff changeset	941 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	942 try:
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	943 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	944 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	945 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	946 '(see hg help resolve)'))
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	947 nodenew = _relocatecommit(repo, orig, commitmsg)
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	948 except error.Abort as exc:
2465 479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	949 with repo.dirstate.parentchange():
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	950 repo.setparents(repo['.'].node(), nullid)
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	951 repo.dirstate.write(tr)
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	952 # fix up dirstate for copies and renames
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	953 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	954
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	955 class LocalMergeFailure(MergeFailure, exc.__class__):
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	956 pass
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	957 exc.__class__ = LocalMergeFailure
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	958 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	959 raise
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	960 _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	961 return nodenew
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	962
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	963 ### new command
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	964 #############################
716 4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	965 metadataopts = [
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	966 ('d', 'date', '',
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	967 _('record the specified date in metadata'), _('DATE')),
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	968 ('u', 'user', '',
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	969 _('record the specified user in metadata'), _('USER')),
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	970 ]
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	971
953 a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	972 @eh.uisetup
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	973 def _installimportobsolete(ui):
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	974 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	975 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	976 _('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	977 '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	978
953 a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	979 @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	980 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	981 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	982 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	983 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	984 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	985 oldextract = patch.extract
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	986 try:
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	987 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	988 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	989 finally:
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	990 patch.extract = oldextract
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	991 created = ret[1]
1055 cfe1b9d3e5d9 import: handle patch with no node information Pierre-Yves David <pierre-yves.david@fb.com> parents: 1054 diff changeset	992 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	993 and created != expected):
953 a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	994 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	995 try:
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	996 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	997 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	998 metadata=metadata)
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	999 tr.close()
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	1000 finally:
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	1001 tr.release()
a02e5916a7e3 import: drop version check for ``import --obsolete`` Pierre-Yves David <pierre-yves.david@fb.com> parents: 952 diff changeset	1002 return ret
930 cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	1003
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1004
894 4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1005 def _deprecatealias(oldalias, newalias):
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1006 '''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	1007
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1008 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	1009 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	1010 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	1011 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	1012 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	1013
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1014 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	1015 '''
1226 901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	1016 try:
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	1017 aliases, entry = cmdutil.findcmd(newalias, cmdtable)
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	1018 except error.UnknownCommand:
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	1019 # Commands may be disabled
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	1020 return
1678 7caa5f2040c5 py3: use items() instead of iteritems() timeless@gmail.com parents: 1677 diff changeset	1021 for alias, e in cmdtable.items():
894 4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1022 if e is entry:
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1023 break
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1024
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1025 synopsis = '(DEPRECATED)'
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1026 if len(entry) > 2:
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1027 fn, opts, _syn = entry
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1028 else:
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1029 fn, opts, = entry
1496 62aa11956a40 evolve: _() should not contain % timeless@mozdev.org parents: 1495 diff changeset	1030 deprecationwarning = _('%s have been deprecated in favor of %s\n') % (
62aa11956a40 evolve: _() should not contain % timeless@mozdev.org parents: 1495 diff changeset	1031 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	1032
894 4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1033 def newfn(args, *kwargs):
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1034 ui = args[0]
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1035 ui.warn(deprecationwarning)
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1036 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	1037 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	1038 cmdwrapper = eh.command(oldalias, opts, synopsis)
894 4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1039 cmdwrapper(newfn)
4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1040
895 17ac69db9329 evolve: deprecate gup and gdown aliases Olle Lundberg <geek@nerd.sh> parents: 894 diff changeset	1041 @eh.extsetup
17ac69db9329 evolve: deprecate gup and gdown aliases Olle Lundberg <geek@nerd.sh> parents: 894 diff changeset	1042 def deprecatealiases(ui):
17ac69db9329 evolve: deprecate gup and gdown aliases Olle Lundberg <geek@nerd.sh> parents: 894 diff changeset	1043 _deprecatealias('gup', 'next')
17ac69db9329 evolve: deprecate gup and gdown aliases Olle Lundberg <geek@nerd.sh> parents: 894 diff changeset	1044 _deprecatealias('gdown', 'previous')
894 4f21a3279a60 evolve: add function to deprecate an alias Olle Lundberg <geek@nerd.sh> parents: 890 diff changeset	1045
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1046 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	1047 """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	1048 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	1049 try:
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	1050 wlock = repo.wlock()
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	1051 lock = repo.lock()
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	1052 tr = repo.transaction("evolve")
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1053 if 'unstable' == category:
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1054 result = _solveunstable(ui, repo, ctx, dryrun, confirm, progresscb)
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1055 elif 'bumped' == category:
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1056 result = _solvebumped(ui, repo, ctx, dryrun, confirm, progresscb)
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1057 elif 'divergent' == category:
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1058 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	1059 progresscb)
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1060 else:
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1061 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	1062 tr.close()
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	1063 return result
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	1064 finally:
b5cd96395867 evolve: extract the logic to solve one change into a method Laurent Charignon <lcharignon@fb.com> parents: 1319 diff changeset	1065 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	1066
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1067 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	1068 """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	1069 no troubles can be resolved"""
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1070 troublecategories = ['bumped', 'divergent', 'unstable']
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1071 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	1072 msg = None
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1073 hint = None
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1074
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1075 troubled = {
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	1076 "unstable": repo.revs("unstable()"),
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	1077 "divergent": repo.revs("divergent()"),
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	1078 "bumped": repo.revs("bumped()"),
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	1079 "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	1080 }
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1081
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1082 hintmap = {
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	1083 'bumped': _("do you want to use --bumped"),
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	1084 'bumped+divergent': _("do you want to use --bumped or --divergent"),
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	1085 'bumped+unstable': _("do you want to use --bumped or --unstable"),
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	1086 'divergent': _("do you want to use --divergent"),
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	1087 'divergent+unstable': _("do you want to use --divergent"
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	1088 " or --unstable"),
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	1089 'unstable': _("do you want to use --unstable"),
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	1090 'any+bumped': _("do you want to use --any (or --rev) and --bumped"),
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	1091 'any+bumped+divergent': _("do you want to use --any (or --rev) and"
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	1092 " --bumped or --divergent"),
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	1093 'any+bumped+unstable': _("do you want to use --any (or --rev) and"
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	1094 "--bumped or --unstable"),
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 'any+divergent': _("do you want to use --any (or --rev) and"
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	1096 " --divergent"),
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	1097 'any+divergent+unstable': _("do you want to use --any (or --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	1098 " and --divergent or --unstable"),
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	1099 'any+unstable': _("do you want to use --any (or --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	1100 "and --unstable"),
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1101 }
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1102
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1103 if revopt:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1104 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	1105 if not revs:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1106 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	1107 else:
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1108 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	1109 othertroubles = []
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1110 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	1111 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	1112 othertroubles.append(cat)
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1113 if othertroubles:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1114 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	1115
1422 c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1421 diff changeset	1116 elif anyopt:
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1117 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	1118 othertroubles = []
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1119 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	1120 if troubled[cat]:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1121 othertroubles.append(cat)
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1122 if othertroubles:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1123 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	1124
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1125 else:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1126 # evolve without any option = relative to the current wdir
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1127 if targetcat == 'unstable':
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1128 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	1129 else:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1130 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	1131
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1132 p1 = repo['.'].rev()
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1133 othertroubles = []
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1134 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	1135 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	1136 othertroubles.append(cat)
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1137 if othertroubles:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1138 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	1139 else:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1140 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	1141 if l:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1142 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	1143 "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	1144 else:
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1145 othertroubles = []
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1146 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	1147 if troubled[cat]:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1148 othertroubles.append(cat)
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1149 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	1150 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	1151 else:
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1152 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	1153
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1154 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	1155 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	1156 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	1157 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	1158 return 2
f11363699766 evolve: refactoring of the code displaying error when no trouble found Laurent Charignon <lcharignon@fb.com> parents: 1315 diff changeset	1159 else:
f11363699766 evolve: refactoring of the code displaying error when no trouble found Laurent Charignon <lcharignon@fb.com> parents: 1315 diff changeset	1160 return 1
1324 739208d1ee62 evolve: extract cleanup logic in the evolve function Laurent Charignon <lcharignon@fb.com> parents: 1323 diff changeset	1161
739208d1ee62 evolve: extract cleanup logic in the evolve function Laurent Charignon <lcharignon@fb.com> parents: 1323 diff changeset	1162 def _cleanup(ui, repo, startnode, showprogress):
739208d1ee62 evolve: extract cleanup logic in the evolve function Laurent Charignon <lcharignon@fb.com> parents: 1323 diff changeset	1163 if showprogress:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1164 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	1165 if repo['.'] != startnode:
bac4e0bc9f6a evolve: write a status message when the working directory changes David Soria Parra <davidsp@fb.com> parents: 1067 diff changeset	1166 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	1167
1408 b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1168 class MultipleSuccessorsError(RuntimeError):
1569 bd1468c23d88 evolve: scattered typo fixes in comments, docstrings Greg Ward <greg@gerg.ca> parents: 1528 diff changeset	1169 """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	1170
b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1171 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	1172 attribute to call to easily recover.
509 c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1173 """
1408 b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1174
b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1175 def __init__(self, successorssets):
b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1176 self.successorssets = successorssets
b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1177
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1178 def _singlesuccessor(repo, p):
1369 4ed67cce8c23 evolve: properly evolve stacked unstable with --rev Laurent Charignon <lcharignon@fb.com> parents: 1364 diff changeset	1179 """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	1180
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1181 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	1182
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1183 if not p.obsolete():
1369 4ed67cce8c23 evolve: properly evolve stacked unstable with --rev Laurent Charignon <lcharignon@fb.com> parents: 1364 diff changeset	1184 return p.rev()
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1185 obs = repo[p]
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1186 ui = repo.ui
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	1187 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	1188 # search of a parent which is not killed
1440 afe46c3b15db evolve: clarify code in _singlesuccessor Laurent Charignon <lcharignon@fb.com> parents: 1428 diff changeset	1189 while not newer:
466 b98490b689a5 stabilize: handle killed changeset in stabilize. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 465 diff changeset	1190 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	1191 " 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	1192 obs)
466 b98490b689a5 stabilize: handle killed changeset in stabilize. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 465 diff changeset	1193 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	1194 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	1195 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	1196 raise MultipleSuccessorsError(newer)
b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1197
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1198 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	1199
1361 043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1200 def builddependencies(repo, revs):
1411 64515965c0df evolve: some style fix Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	1201 """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	1202 (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	1203
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1204 # 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	1205 # 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	1206 # dependencies = {3: [6], 6:[]}
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1207 # 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	1208 dependencies = {}
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1209 # 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	1210 rdependencies = collections.defaultdict(set)
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1211
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1212 for r in revs:
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1213 dependencies[r] = set()
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1214 for p in repo[r].parents():
1408 b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1215 try:
b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1216 succ = _singlesuccessor(repo, p)
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1217 except MultipleSuccessorsError as exc:
1408 b3afdc0815d0 evolve: skip unstable changesets with multiple successorssets Laurent Charignon <lcharignon@fb.com> parents: 1407 diff changeset	1218 dependencies[r] = exc.successorssets
1418 ed9a8b1ee9bd evolve: fix error in builddependencies Laurent Charignon <lcharignon@fb.com> parents: 1415 diff changeset	1219 continue
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1220 if succ in revs:
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1221 dependencies[r].add(succ)
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1222 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	1223 return dependencies, rdependencies
043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1224
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1225 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	1226 """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	1227 lowest revision numbers
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1228 """
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1229 repo = repo.unfiltered()
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1230 res = set()
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1231 # 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	1232 discarded = set()
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1233 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	1234 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	1235 continue
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1236 divergent = repo[rev]
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1237 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	1238 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	1239 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	1240 discarded.update(othersrevs)
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1241 return res
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1242
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1243 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	1244 """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	1245 revs = set()
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1246 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	1247 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	1248 if revopt:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1249 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	1250 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	1251 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	1252 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	1253 revs = repo.revs('topic(%s)', topic) & revs
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: 1624 diff changeset	1254 elif targetcat == 'unstable':
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: 1624 diff changeset	1255 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	1256 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	1257 revs = set(revs)
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1258 if targetcat == 'divergent':
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1466 diff changeset	1259 # 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	1260 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	1261 elif anyopt:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1262 revs = repo.revs('first(%s())' % (targetcat))
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1263 elif targetcat == 'unstable':
1421 8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1264 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	1265 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	1266 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	1267 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	1268 % ', '.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	1269 raise error.Abort(msg, hint=hint)
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1270 elif targetcat in repo['.'].troubles():
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1271 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	1272 return revs
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1273
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1274
1411 64515965c0df evolve: some style fix Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	1275 def _orderrevs(repo, revs):
64515965c0df evolve: some style fix Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	1276 """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	1277
1571 0e8936e7cb89 evolve: improve the confusing docstring for _orderrevs() Greg Ward <greg@gerg.ca> parents: 1570 diff changeset	1278 revs is a list of unstable revisions.
0e8936e7cb89 evolve: improve the confusing docstring for _orderrevs() Greg Ward <greg@gerg.ca> parents: 1570 diff changeset	1279
0e8936e7cb89 evolve: improve the confusing docstring for _orderrevs() Greg Ward <greg@gerg.ca> parents: 1570 diff changeset	1280 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	1281 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	1282 eventually.
043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1283
1571 0e8936e7cb89 evolve: improve the confusing docstring for _orderrevs() Greg Ward <greg@gerg.ca> parents: 1570 diff changeset	1284 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	1285 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	1286 """
043e5ca9322f evolve: extract the code computing dependencies in a separate function Laurent Charignon <lcharignon@fb.com> parents: 1357 diff changeset	1287 # 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	1288 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	1289 # Step 2: Build the ordering
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1290 # 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	1291 # 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	1292 # 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	1293 # 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	1294 # built
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1295 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	1296 if not dependencies[r]])
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1297 ordering = []
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1298 while solvablerevs:
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1299 rev = solvablerevs.popleft()
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1300 for dependent in rdependencies[rev]:
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1301 dependencies[dependent].remove(rev)
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1302 if not dependencies[dependent]:
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1303 solvablerevs.append(dependent)
1412 8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1304 del dependencies[rev]
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1305 ordering.append(rev)
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1306
1412 8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1307 ordering.extend(sorted(dependencies))
1357 3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1308 return ordering
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev Laurent Charignon <lcharignon@fb.com> parents: 1354 diff changeset	1309
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1310 def divergentsets(repo, ctx):
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1311 """Compute sets of commits divergent with a given one"""
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1312 cache = {}
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1313 base = {}
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	1314 for n in compat.allprecursors(repo.obsstore, [ctx.node()]):
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1315 if n == ctx.node():
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1316 # 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	1317 continue
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	1318 nsuccsets = compat.successorssets(repo, n, cache)
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1319 for nsuccset in nsuccsets:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1320 if ctx.node() in nsuccset:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1321 # we are only interested in other successor sets
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1322 continue
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1323 if tuple(nsuccset) in base:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1324 # we already know the latest base for this divergency
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1325 continue
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1326 base[tuple(nsuccset)] = n
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1327 divergence = []
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1328 for divset, b in base.iteritems():
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1329 divergence.append({
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1330 'divergentnodes': divset,
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1331 'commonprecursor': b
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
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1334 return divergence
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1335
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1336 def _preparelistctxs(items, condition):
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1337 return [item.hex() for item in items if condition(item)]
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1338
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1339 def _formatctx(fm, ctx):
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1340 fm.data(node=ctx.hex())
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1341 fm.data(desc=ctx.description())
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1342 fm.data(date=ctx.date())
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1343 fm.data(user=ctx.user())
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1344
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1345 def listtroubles(ui, repo, troublecategories, **opts):
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1346 """Print all the troubles for the repo (or given revset)"""
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1347 troublecategories = troublecategories or ['divergent', 'unstable', 'bumped']
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1348 showunstable = 'unstable' in troublecategories
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1349 showbumped = 'bumped' in troublecategories
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1350 showdivergent = 'divergent' in troublecategories
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 revs = repo.revs('+'.join("%s()" % t for t in troublecategories))
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1353 if opts.get('rev'):
2479 df9233aa4bac evolve: fix --rev with --list Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2475 diff changeset	1354 revs = scmutil.revrange(repo, opts.get('rev'))
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1355
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1356 fm = ui.formatter('evolvelist', opts)
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1357 for rev in revs:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1358 ctx = repo[rev]
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1359 unpars = _preparelistctxs(ctx.parents(), lambda p: p.unstable())
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1360 obspars = _preparelistctxs(ctx.parents(), lambda p: p.obsolete())
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1361 imprecs = _preparelistctxs(repo.set("allprecursors(%n)", ctx.node()),
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1362 lambda p: not p.mutable())
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1363 dsets = divergentsets(repo, ctx)
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1364
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1365 fm.startitem()
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1366 # plain formatter section
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1367 hashlen, desclen = 12, 60
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1368 desc = ctx.description()
1637 078e6777ac15 list: limit to descriptions to firstline timeless@gmail.com parents: 1636 diff changeset	1369 if desc:
078e6777ac15 list: limit to descriptions to firstline timeless@gmail.com parents: 1636 diff changeset	1370 desc = desc.splitlines()[0]
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1371 desc = (desc[:desclen] + '...') if len(desc) > desclen else desc
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1372 fm.plain('%s: ' % ctx.hex()[:hashlen])
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1373 fm.plain('%s\n' % desc)
1680 fe4b41a2af4e evolve: include node, rev, desc, and phase in list timeless@gmail.com parents: 1679 diff changeset	1374 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	1375
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1376 for unpar in unpars if showunstable else []:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1377 fm.plain(' unstable: %s (unstable parent)\n' % unpar[:hashlen])
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1378 for obspar in obspars if showunstable else []:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1379 fm.plain(' unstable: %s (obsolete parent)\n' % obspar[:hashlen])
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1380 for imprec in imprecs if showbumped else []:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1381 fm.plain(' bumped: %s (immutable precursor)\n' % imprec[:hashlen])
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1382
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1383 if dsets and showdivergent:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1384 for dset in dsets:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1385 fm.plain(' divergent: ')
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1386 first = True
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1387 for n in dset['divergentnodes']:
1646 7e1b49cda66c list: report the phase for divergent commits timeless@gmail.com parents: 1640 diff changeset	1388 t = "%s (%s)" if first else " %s (%s)"
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1389 first = False
1646 7e1b49cda66c list: report the phase for divergent commits timeless@gmail.com parents: 1640 diff changeset	1390 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	1391 comprec = node.hex(dset['commonprecursor'])[:hashlen]
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1392 fm.plain(" (precursor %s)\n" % comprec)
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1393 fm.plain("\n")
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1394
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1395 # templater-friendly section
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1396 _formatctx(fm, ctx)
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1397 troubles = []
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1398 for unpar in unpars:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1399 troubles.append({'troubletype': 'unstable', 'sourcenode': unpar,
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1400 'sourcetype': 'unstableparent'})
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1401 for obspar in obspars:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1402 troubles.append({'troubletype': 'unstable', 'sourcenode': obspar,
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1403 'sourcetype': 'obsoleteparent'})
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1404 for imprec in imprecs:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1405 troubles.append({'troubletype': 'bumped', 'sourcenode': imprec,
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1406 'sourcetype': 'immutableprecursor'})
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1407 for dset in dsets:
1679 db1db8633b8c evolve: use hex in list output timeless@gmail.com parents: 1678 diff changeset	1408 divnodes = [{'node': node.hex(n),
1680 fe4b41a2af4e evolve: include node, rev, desc, and phase in list timeless@gmail.com parents: 1679 diff changeset	1409 'phase': repo[n].phasestr(),
1679 db1db8633b8c evolve: use hex in list output timeless@gmail.com parents: 1678 diff changeset	1410 } for n in dset['divergentnodes']]
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1411 troubles.append({'troubletype': 'divergent',
1679 db1db8633b8c evolve: use hex in list output timeless@gmail.com parents: 1678 diff changeset	1412 'commonprecursor': node.hex(dset['commonprecursor']),
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1413 'divergentnodes': divnodes})
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1414 fm.data(troubles=troubles)
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1415
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1416 fm.end()
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1417
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1418 @eh.command(
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1419 '^evolve\|stabilize\|solve',
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1420 [('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	1421 _('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	1422 ('', 'confirm', False,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1423 _('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	1424 ('A', 'any', False,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1425 _('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	1426 'directory')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1427 ('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	1428 ('', 'bumped', False, _('solves only bumped changesets')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1429 ('', 'divergent', False, _('solves only divergent changesets')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1430 ('', 'unstable', False, _('solves only unstable changesets (default)')),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1431 ('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	1432 '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	1433 ('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	1434 ('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	1435 ] + mergetoolopts,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1436 _('[OPTIONS]...')
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	1437 )
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	1438 def evolve(ui, repo, **opts):
1528 afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1439 """solve troubled changesets in your repository
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1440
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1441 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	1442 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	1443 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	1444
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1445 - update working copy to a successor
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1446 - rebase an unstable changeset
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1447 - 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	1448 - fuse divergent changesets back together
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1449
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1450 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	1451 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	1452 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	1453 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	1454 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	1455 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	1456 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	1457 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	1458 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	1459
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1460 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	1461 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	1462 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	1463
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1464 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	1465 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	1466 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	1467 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	1468 request such behavior (see below).
1528 afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1469
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1470 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	1471 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	1472 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	1473 working copy parent.
1528 afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1474 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	1475 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	1476 evolving all branches.
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1477
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1478 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	1479 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	1480 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	1481 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	1482 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	1483 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	1484
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1485 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	1486 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	1487
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1488 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	1489 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	1490 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	1491 ``--rev`` and ``--any``.
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1492
afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1493 ``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	1494 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	1495
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1496 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	1497 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	1498 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	1499 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	1500 (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	1501 ``--rev``, ``--all``, or ``--any``.
1528 afb0a33c4f6c evolve: rewrite command help (evolve command only) Greg Ward <greg@gerg.ca> parents: 1527 diff changeset	1502
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1503 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	1504 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	1505 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	1506 """
145 928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	1507
1325 1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1324 diff changeset	1508 # Options
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1509 listopt = opts['list']
465 4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	1510 contopt = opts['continue']
4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	1511 anyopt = opts['any']
704 2ec7c3673679 evolve: add --all argument. Levi Bard <levi@unity3d.com> parents: 703 diff changeset	1512 allopt = opts['all']
1318 29363f79514f evolve: move code to track progress and start node Laurent Charignon <lcharignon@fb.com> parents: 1317 diff changeset	1513 startnode = repo['.']
703 a246b02499d9 evolve: extract evolve --any implementation into a function. Levi Bard <levi@unity3d.com> parents: 663 diff changeset	1514 dryrunopt = opts['dry_run']
1047 d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1515 confirmopt = opts['confirm']
1325 1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1324 diff changeset	1516 revopt = opts['rev']
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1517 troublecategories = ['bumped', 'divergent', 'unstable']
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1518 specifiedcategories = [t for t in troublecategories if opts[t]]
1634 9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1519 if listopt:
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1520 listtroubles(ui, repo, specifiedcategories, **opts)
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1521 return
9ae4e79a28f3 evolve--list: initial implementation Kostia Balytskyi <ikostia@fb.com> parents: 1633 diff changeset	1522
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1523 targetcat = 'unstable'
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1524 if 1 < len(specifiedcategories):
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1525 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	1526 raise error.Abort(msg)
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1527 elif len(specifiedcategories) == 1:
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1528 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	1529 elif repo['.'].obsolete():
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1530 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	1531 {'template': shorttemplate})
1409 3276730e4b32 evolve: move the 'update' if '.' is obsolete earlier Pierre-Yves David <pierre-yves.david@fb.com> parents: 1408 diff changeset	1532 # 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	1533 try:
3276730e4b32 evolve: move the 'update' if '.' is obsolete earlier Pierre-Yves David <pierre-yves.david@fb.com> parents: 1408 diff changeset	1534 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	1535 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	1536 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	1537 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	1538 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	1539 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	1540 return 2
3276730e4b32 evolve: move the 'update' if '.' is obsolete earlier Pierre-Yves David <pierre-yves.david@fb.com> parents: 1408 diff changeset	1541
1410 2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1542 ui.status(_('update:'))
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1543 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	1544 displayer.show(ctx)
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1545
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1546 if dryrunopt:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1547 return 0
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1548 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	1549 if ctx != startnode:
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1550 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	1551 return res
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1552
986 c1f8ece4182d evolve: add --tool option so we don't have to use HGMERGE Greg Ward <greg@gerg.ca> parents: 985 diff changeset	1553 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'evolve')
1323 603104c880f7 evolve: simplify the evolve function Laurent Charignon <lcharignon@fb.com> parents: 1322 diff changeset	1554 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	1555
1318 29363f79514f evolve: move code to track progress and start node Laurent Charignon <lcharignon@fb.com> parents: 1317 diff changeset	1556 # Progress handling
29363f79514f evolve: move code to track progress and start node Laurent Charignon <lcharignon@fb.com> parents: 1317 diff changeset	1557 seen = 1
1323 603104c880f7 evolve: simplify the evolve function Laurent Charignon <lcharignon@fb.com> parents: 1322 diff changeset	1558 count = allopt and len(troubled) or 1
1319 8376fe35ebda evolve: add new variable and comment Laurent Charignon <lcharignon@fb.com> parents: 1318 diff changeset	1559 showprogress = allopt
1318 29363f79514f evolve: move code to track progress and start node Laurent Charignon <lcharignon@fb.com> parents: 1317 diff changeset	1560
29363f79514f evolve: move code to track progress and start node Laurent Charignon <lcharignon@fb.com> parents: 1317 diff changeset	1561 def progresscb():
1325 1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1324 diff changeset	1562 if revopt or allopt:
1624 081605c2e9b6 evolve: mark progress units for translation Anton Shestakov <av6@dwimlabs.net> parents: 1623 diff changeset	1563 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	1564
1319 8376fe35ebda evolve: add new variable and comment Laurent Charignon <lcharignon@fb.com> parents: 1318 diff changeset	1565 # Continuation handling
465 4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	1566 if contopt:
4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	1567 if anyopt:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1568 raise error.Abort('cannot specify both "--any" and "--continue"')
704 2ec7c3673679 evolve: add --all argument. Levi Bard <levi@unity3d.com> parents: 703 diff changeset	1569 if allopt:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1570 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	1571 state = _evolvestateread(repo)
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	1572 if state is None:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	1573 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	1574 orig = repo[state['current']]
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	1575 # 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	1576 lock = repo.wlock()
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	1577 try:
2051 74934195747b evolve: switch away from deprecated repo.opener Martin von Zweigbergk <martinvonz@google.com> parents: 2049 diff changeset	1578 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	1579 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	1580 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	1581 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	1582 _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	1583 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	1584 finally:
2070 9105c3c54045 cleanup: stop using 'repo.join' methods Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2064 diff changeset	1585 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	1586 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	1587 lock.release()
1402 08ae023882f1 evolve: check for uncommited change earlier Laurent Charignon <lcharignon@fb.com> parents: 1398 diff changeset	1588 cmdutil.bailifchanged(repo)
08ae023882f1 evolve: check for uncommited change earlier Laurent Charignon <lcharignon@fb.com> parents: 1398 diff changeset	1589
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1590 if revopt and allopt:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1591 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	1592 if revopt and anyopt:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1593 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	1594
2c451fece7a6 evolve: unify revision handling and rework error message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1409 diff changeset	1595 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	1596
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1597 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	1598 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	1599
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1600 # For the progress bar to show
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1601 count = len(revs)
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1602 # Order the revisions
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1603 if targetcat == 'unstable':
1411 64515965c0df evolve: some style fix Pierre-Yves David <pierre-yves.david@fb.com> parents: 1410 diff changeset	1604 revs = _orderrevs(repo, revs)
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1605 for rev in revs:
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1606 progresscb()
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1607 _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	1608 progresscb, targetcat)
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1609 seen += 1
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1610 progresscb()
1324 739208d1ee62 evolve: extract cleanup logic in the evolve function Laurent Charignon <lcharignon@fb.com> parents: 1323 diff changeset	1611 _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	1612
1421 8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1613 def _possibledestination(repo, rev):
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1614 """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	1615 tonode = repo.changelog.node
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1616 parents = repo.changelog.parentrevs
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1617 torev = repo.changelog.rev
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1618 dest = set()
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1619 tovisit = list(parents(rev))
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1620 while tovisit:
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1621 r = tovisit.pop()
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	1622 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	1623 if not succsets:
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1624 tovisit.extend(parents(r))
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1625 else:
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1626 # 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	1627 # (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	1628 # 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	1629 # multiple branches.
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1630 for ss in succsets:
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1631 for n in ss:
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1632 dest.add(torev(n))
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1633 return dest
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1634
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1635 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	1636 """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	1637 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	1638 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	1639 result = []
1421 8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1640 for r in repo.revs('unstable() - %ld', revs):
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1641 dest = _possibledestination(repo, r)
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1642 if target & dest:
8f18c7b3af14 rework refactor _aspiringchildren by introducing _possibledestination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1420 diff changeset	1643 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	1644 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	1645
1422 c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1421 diff changeset	1646 def _aspiringdescendant(repo, revs):
c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1421 diff changeset	1647 """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	1648 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	1649 target = set(revs)
c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1421 diff changeset	1650 result = set(target)
1423 ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1651 paths = collections.defaultdict(set)
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1652 for r in repo.revs('unstable() - %ld', revs):
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1653 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	1654 paths[d].add(r)
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1655
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1656 result = set(target)
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1657 tovisit = list(revs)
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1658 while tovisit:
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1659 base = tovisit.pop()
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1660 for unstable in paths[base]:
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1661 if unstable not in result:
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1662 tovisit.append(unstable)
ecd669c36c12 evolve: non recursive implementation for _aspiringdescendants Pierre-Yves David <pierre-yves.david@fb.com> parents: 1422 diff changeset	1663 result.add(unstable)
1422 c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1421 diff changeset	1664 return sorted(result - target)
c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1421 diff changeset	1665
1047 d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1666 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	1667 progresscb=None):
1569 bd1468c23d88 evolve: scattered typo fixes in comments, docstrings Greg Ward <greg@gerg.ca> parents: 1528 diff changeset	1668 """Stabilize an unstable changeset"""
1576 526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1669 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	1670 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	1671 if len(orig.parents()) == 2:
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1672 if not pctx.obsolete():
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1673 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	1674 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	1675 elif orig.p2().obsolete():
1639 ff0ff0f28a13 evolve: report merge node timeless@gmail.com parents: 1638 diff changeset	1676 hint = _("Redo the merge (%s) and use `hg prune <old> "
ff0ff0f28a13 evolve: report merge node timeless@gmail.com parents: 1638 diff changeset	1677 "--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	1678 ui.warn(_("warning: no support for evolving merge changesets "
5b7596805f7f evolve: treat no support as non fatal timeless@gmail.com parents: 1637 diff changeset	1679 "with two obsolete parents yet\n") +
5b7596805f7f evolve: treat no support as non fatal timeless@gmail.com parents: 1637 diff changeset	1680 _("(%s)\n") % hint)
5b7596805f7f evolve: treat no support as non fatal timeless@gmail.com parents: 1637 diff changeset	1681 return False
1576 526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1682
526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1683 if not pctx.obsolete():
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1684 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	1685 return False
1576 526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1686 obs = pctx
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	1687 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	1688 # 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	1689 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	1690 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	1691 " 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	1692 obs)
466 b98490b689a5 stabilize: handle killed changeset in stabilize. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 465 diff changeset	1693 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	1694 newer = compat.successorssets(repo, obs.node())
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1695 if len(newer) > 1:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1696 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	1697 "destination\n") % obs
1412 8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1698 ui.write_err(msg)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1699 return 2
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1700 targets = newer[0]
466 b98490b689a5 stabilize: handle killed changeset in stabilize. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 465 diff changeset	1701 assert targets
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1702 if len(targets) > 1:
1481 3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1703 # 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	1704 targetrevs = [repo[r].rev() for r in targets]
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1705 roots = repo.revs('roots(%ld)', targetrevs)
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1706 heads = repo.revs('heads(%ld)', targetrevs)
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1707 if len(roots) > 1 or len(heads) > 1:
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1708 msg = "cannot solve split accross two branches\n"
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1709 ui.write_err(msg)
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1710 return 2
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1711 target = repo[heads.first()]
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1712 else:
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1478 diff changeset	1713 target = targets[0]
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1714 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	1715 target = repo[target]
1047 d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1716 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	1717 repo.ui.write(_('move:'))
464 d88c761f97c4 stabilize: rename "node" variable to "orig" Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 463 diff changeset	1718 displayer.show(orig)
1046 296d48e1f55a evolve: gather evolve output together Pierre-Yves David <pierre-yves.david@fb.com> parents: 1045 diff changeset	1719 repo.ui.write(_('atop:'))
146 e80a6c8ad452 stabilize: proper --quiet behavior Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 145 diff changeset	1720 displayer.show(target)
1390 03f202bed47f evolve: fix default value for --confirm Pierre-Yves David <pierre-yves.david@fb.com> parents: 1389 diff changeset	1721 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	1722 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	1723 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	1724 progresscb()
546 415540dee2bd fix missing --dest evolve output in dryrun Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 540 diff changeset	1725 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	1726 if dryrun:
146 e80a6c8ad452 stabilize: proper --quiet behavior Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 145 diff changeset	1727 repo.ui.write(todo)
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1728 else:
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1729 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	1730 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	1731 progresscb()
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1732 try:
1576 526253198860 evolve: handle merge commit with single obsolete parent (issue4389) Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 1575 diff changeset	1733 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	1734 except MergeFailure:
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	1735 _evolvestatewrite(repo, {'current': orig.node()})
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	1736 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	1737 repo.ui.write_err(
1756 a7dcfff8c4a9 evolve: use single quotes in usage messages Martin von Zweigbergk <martinvonz@google.com> parents: 1755 diff changeset	1738 _("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	1739 " 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	1740 raise
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	1741
1047 d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1742 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	1743 progresscb=None):
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1744 """Stabilize a bumped changeset"""
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1745 repo = repo.unfiltered()
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1746 bumped = repo[bumped.rev()]
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1747 # For now we deny bumped merge
26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1748 if len(bumped.parents()) > 1:
1496 62aa11956a40 evolve: _() should not contain % timeless@mozdev.org parents: 1495 diff changeset	1749 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	1750 ui.write_err(msg)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1751 return 2
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1752 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	1753 # For now we deny target merge
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1754 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	1755 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	1756 '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	1757 ui.write_err(msg)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1758 return 2
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1759
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1760 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	1761 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	1762 repo.ui.write(_('recreate:'))
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1763 displayer.show(bumped)
1046 296d48e1f55a evolve: gather evolve output together Pierre-Yves David <pierre-yves.david@fb.com> parents: 1045 diff changeset	1764 repo.ui.write(_('atop:'))
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1765 displayer.show(prec)
1390 03f202bed47f evolve: fix default value for --confirm Pierre-Yves David <pierre-yves.david@fb.com> parents: 1389 diff changeset	1766 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	1767 raise error.Abort(_('evolve aborted by user'))
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1768 if dryrun:
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1769 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	1770 repo.ui.write(todo)
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1771 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	1772 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	1773 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	1774 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	1775 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	1776 progresscb()
1021 200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1777 newid = tmpctx = None
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1778 tmpctx = bumped
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1779 # 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	1780 tr = repo.currenttransaction()
2f117c299325 evolve: remove meaningless transaction nesting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 1592 diff changeset	1781 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	1782 bmupdate = _bookmarksupdater(repo, bumped.node(), tr)
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1783 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	1784 # 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	1785 repo.ui.status(
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1786 _('rebasing to destination parent: %s\n') % prec.p1())
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1787 try:
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1788 tmpid = relocate(repo, bumped, prec.p1())
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1789 if tmpid is not None:
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1790 tmpctx = repo[tmpid]
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1791 obsolete.createmarkers(repo, [(bumped, (tmpctx,))])
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1792 except MergeFailure:
2051 74934195747b evolve: switch away from deprecated repo.opener Martin von Zweigbergk <martinvonz@google.com> parents: 2049 diff changeset	1793 repo.vfs.write('graftstate', bumped.hex() + '\n')
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1794 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	1795 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	1796 repo.ui.write_err(msg)
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1797 raise
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1798 # Create the new commit context
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1799 repo.ui.status(_('computing new diff\n'))
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1800 files = set()
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1801 copied = copies.pathcopies(prec, bumped)
1736 c9a79b432907 merge with stable Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1732 1735 diff changeset	1802 precmanifest = prec.manifest().copy()
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1803 # 3.3.2 needs a list.
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1804 # 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	1805 # this is fishy
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1806 for key, val in list(bumped.manifest().iteritems()):
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1807 precvalue = precmanifest.get(key, None)
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1808 if precvalue is not None:
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1809 del precmanifest[key]
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1810 if precvalue != val:
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1811 files.add(key)
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1812 files.update(precmanifest) # add missing files
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1813 # commit it
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1814 if files: # something to commit!
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1815 def filectxfn(repo, ctx, path):
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1816 if path in bumped:
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1817 fctx = bumped[path]
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1818 flags = fctx.flags()
1828 2b80c01b3f58 compat: drop compatibility layer around memctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1827 diff changeset	1819 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	1820 islink='l' in flags,
2b80c01b3f58 compat: drop compatibility layer around memctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1827 diff changeset	1821 isexec='x' in flags,
2b80c01b3f58 compat: drop compatibility layer around memctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1827 diff changeset	1822 copied=copied.get(path))
1729 8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1823 return mctx
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1824 return None
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1825 text = 'bumped update to %s:\n\n' % prec
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1826 text += bumped.description()
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1827
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1828 new = context.memctx(repo,
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1829 parents=[prec.node(), node.nullid],
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1830 text=text,
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1831 files=files,
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1832 filectxfn=filectxfn,
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1833 user=bumped.user(),
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1834 date=bumped.date(),
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1835 extra=bumped.extra())
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1836
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1837 newid = repo.commitctx(new)
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1838 if newid is None:
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1839 obsolete.createmarkers(repo, [(tmpctx, ())])
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1840 newid = prec.node()
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1841 else:
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1842 phases.retractboundary(repo, tr, bumped.phase(), [newid])
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1843 obsolete.createmarkers(repo, [(tmpctx, (repo[newid],))],
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1844 flag=obsolete.bumpedfix)
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1845 bmupdate(newid)
8ed0266c58a3 evolve: removed redundant try/finally blocks Pulkit Goyal <7895pulkit@gmail.com> parents: 1726 diff changeset	1846 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	1847 # 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	1848 with repo.dirstate.parentchange():
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	1849 repo.dirstate.setparents(newid, node.nullid)
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1850
1047 d830377bf186 evolve: adds a --confirm option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1046 diff changeset	1851 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	1852 progresscb=None):
1404 848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1853 repo = repo.unfiltered()
848a04c078c7 evolve: add selector for trouble types Laurent Charignon <lcharignon@fb.com> parents: 1403 diff changeset	1854 divergent = repo[divergent.rev()]
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1855 base, others = divergentdata(divergent)
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1856 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	1857 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	1858 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	1859 " 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	1860 "\|[%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	1861 "\| 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	1862 "\| 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	1863 "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	1864 "\| - 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	1865 "\| - 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	1866 "\| \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	1867 "\| 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	1868 ) % (divergent, othersstr)
1412 8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1869 ui.write_err(msg)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1870 return 2
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1871 other = others[0]
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1872 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	1873 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	1874 "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	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 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	1877 "\| 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	1878 "\| `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	1879 ui.write_err(hint)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1880 return 2
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1881 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	1882 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	1883 "(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	1884 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	1885 "\| 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	1886 "\| 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	1887 "\| 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	1888 "\| this command again.\n"
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1889 "\| - 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	1890 "\| - 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	1891 ) % {'d': divergent, 'o': other}
1412 8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1892 ui.write_err(msg)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1893 ui.write_err(hint)
8794a4680bdd evolve: warn about every skipped evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1411 diff changeset	1894 return 2
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1895
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1896 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	1897 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	1898 ui.write(_('merge:'))
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1899 displayer.show(divergent)
1046 296d48e1f55a evolve: gather evolve output together Pierre-Yves David <pierre-yves.david@fb.com> parents: 1045 diff changeset	1900 ui.write(_('with: '))
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1901 displayer.show(other)
1046 296d48e1f55a evolve: gather evolve output together Pierre-Yves David <pierre-yves.david@fb.com> parents: 1045 diff changeset	1902 ui.write(_('base: '))
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1903 displayer.show(base)
1498 3d9a546dcbc5 evolve: annotate translatable strings with _() timeless@mozdev.org parents: 1497 diff changeset	1904 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	1905 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	1906 if dryrun:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1907 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	1908 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	1909 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	1910 '%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	1911 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	1912 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	1913 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	1914 % divergent))
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1915 return
1021 200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1916 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	1917 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	1918 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	1919 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	1920 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	1921 progresscb()
1831 0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	1922 stats = merge.update(repo,
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	1923 other.node(),
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	1924 branchmerge=True,
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	1925 force=False,
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	1926 ancestor=base.node(),
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	1927 mergeancestor=True)
1021 200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1928 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	1929 if stats[3]:
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1930 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	1931 "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	1932 if stats[3] > 0:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	1933 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	1934 '(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	1935 hint="""/!\ You can try:
534 45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1936 /!\ * manual merge + resolve => new cset X
45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1937 /!\ * 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	1938 /!\ * hg revert --all -r X
45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1939 /!\ * 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	1940 /!\ * 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	1941 """)
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	1942 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	1943 progresscb()
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1532 diff changeset	1944 emtpycommitallowed = repo.ui.backupconfig('ui', 'allowemptycommit')
1593 2f117c299325 evolve: remove meaningless transaction nesting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 1592 diff changeset	1945 tr = repo.currenttransaction()
2f117c299325 evolve: remove meaningless transaction nesting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 1592 diff changeset	1946 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	1947 try:
1636 13f830540a14 config: report evolve as origin for config timeless@gmail.com parents: 1635 diff changeset	1948 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	1949 with repo.dirstate.parentchange():
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	1950 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	1951 oldlen = len(repo)
2724 e6bc6eaa17c5 amend: extract into a 'evolve.evocommands' module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2716 diff changeset	1952 evocommands.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	1953 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	1954 new = divergent
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1955 # no changes
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1956 else:
200f2d9b9f39 evolve: saner locking an transaction in `hg evolve` Pierre-Yves David <pierre-yves.david@fb.com> parents: 1020 diff changeset	1957 new = repo['.']
1070 527b12a59628 drop relevant marker compat Pierre-Yves David <pierre-yves.david@fb.com> parents: 1069 diff changeset	1958 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	1959 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	1960 finally:
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1532 diff changeset	1961 repo.ui.restoreconfig(emtpycommitallowed)
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1962
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1963 def divergentdata(ctx):
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1964 """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	1965
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1966 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	1967
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1968 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	1969 """
1375 9e062e6598e9 evolve: search divergence within all precursors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1374 diff changeset	1970 repo = ctx._repo.unfiltered()
9e062e6598e9 evolve: search divergence within all precursors Pierre-Yves David <pierre-yves.david@fb.com> parents: 1374 diff changeset	1971 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	1972 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	1973 # 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	1974 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	1975 if newer:
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1976 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	1977 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	1978 hint='this case is not yet handled')
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1979
2396 c1485ebdd6b9 color: update the shorttemplate to use colors Boris Feld <boris.feld@octobus.net> parents: 2350 diff changeset	1980 shorttemplate = "[{label('evolve.rev', rev)}] {desc\|firstline}\n"
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	1981
2745 b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	1982 def _gettopic(ctx):
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	1983 """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	1984 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	1985
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	1986 def _gettopicidx(ctx):
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	1987 """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	1988 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	1989
2742 64fb1a082f58 prev: add '_getcurrenttopic' helper and use it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2741 diff changeset	1990 def _getcurrenttopic(repo):
64fb1a082f58 prev: add '_getcurrenttopic' helper and use it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2741 diff changeset	1991 return getattr(repo, 'currenttopic', '')
64fb1a082f58 prev: add '_getcurrenttopic' helper and use it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2741 diff changeset	1992
2736 3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1993 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	1994 if dryrun:
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1995 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	1996 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	1997 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	1998 % (bookmark, target.rev())))
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	1999 else:
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	2000 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	2001 if not ret:
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	2002 tr = lock = None
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	2003 try:
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	2004 lock = repo.lock()
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	2005 tr = repo.transaction('previous')
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	2006 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	2007 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	2008 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	2009 else:
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	2010 bookmarksmod.deactivate(repo)
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	2011 tr.close()
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	2012 finally:
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	2013 lockmod.release(tr, lock)
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	2014
3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	2015 displayer.show(target)
2739 7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2016
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2017 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	2018 target = bookmark = None
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2019 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	2020 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	2021 parents = p1.parents()
2742 64fb1a082f58 prev: add '_getcurrenttopic' helper and use it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2741 diff changeset	2022 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	2023
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	2024 # 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	2025 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	2026 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	2027
51d669b16fa8 prev: explicitly use 'p1' as a variable name Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2739 diff changeset	2028 # 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	2029 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	2030 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	2031 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	2032 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	2033 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	2034 elif len(parents) == 1:
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2035 target = parents[0]
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2036 bookmark = None
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2037 if movebookmark:
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2038 bookmark = repo._activebookmark
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2039 else:
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2040 for p in parents:
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2041 displayer.show(p)
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2042 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	2043 return target, bookmark
2736 3c87d5276394 prev: extract the function performing the update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2735 diff changeset	2044
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2045 @eh.command(
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2046 '^previous',
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2047 [('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	2048 _('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	2049 ('', '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	2050 ('', '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	2051 ('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	2052 _('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	2053 '[OPTION]...')
1160 e29a813f6af5 Make next/prev only move bookmarks optionally Ryan McElroy <rmcelroy@fb.com> parents: 1157 diff changeset	2054 def cmdprevious(ui, repo, **opts):
1572 44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2055 """update to parent revision
44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2056
44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2057 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	2058 wlock = None
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2059 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	2060 if not dryrunopt:
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2061 wlock = repo.wlock()
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2062 try:
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2063 wkctx = repo[None]
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2064 wparents = wkctx.parents()
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2065 if len(wparents) != 1:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2066 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	2067 if not opts['merge']:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2068 try:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2069 cmdutil.bailifchanged(repo)
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2070 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	2071 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	2072 raise
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2073
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2074 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	2075 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	2076
7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2077 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	2078 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	2079 if target is not None:
2745 b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	2080 overrides = {}
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	2081 if topic and _getcurrenttopic(repo) != _gettopic(target):
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	2082 overrides[('_internal', 'keep-topic')] = 'yes'
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	2083 with repo.ui.configoverride(overrides, source='topic-extension'):
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2743 diff changeset	2084 _prevupdate(repo, displayer, target, bookmark, dryrunopt)
2739 7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2738 diff changeset	2085 return 0
1500 b4dfafda72c2 next: add support for --dry-run timeless@mozdev.org parents: 1499 diff changeset	2086 else:
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2087 return 1
1742 970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2088 finally:
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2089 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	2090
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2091 @eh.command(
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2092 '^next',
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2093 [('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	2094 _('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	2095 ('', '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	2096 ('', '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	2097 ('', '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	2098 ('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	2099 _('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	2100 '[OPTION]...')
1160 e29a813f6af5 Make next/prev only move bookmarks optionally Ryan McElroy <rmcelroy@fb.com> parents: 1157 diff changeset	2101 def cmdnext(ui, repo, **opts):
1572 44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2102 """update to next child revision
44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2103
44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2104 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	2105
44e9c0a264de evolve: improve help for prev, next commands Greg Ward <greg@gerg.ca> parents: 1571 diff changeset	2106 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	2107 """
1742 970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2108 wlock = None
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2109 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	2110 if not dryrunopt:
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2111 wlock = repo.wlock()
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2112 try:
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2113 wkctx = repo[None]
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2114 wparents = wkctx.parents()
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2115 if len(wparents) != 1:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2116 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	2117 if not opts['merge']:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2118 try:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2119 cmdutil.bailifchanged(repo)
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2120 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	2121 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	2122 raise
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2123
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2124 children = [ctx for ctx in wparents[0].children() if not ctx.obsolete()]
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2125 topic = getattr(repo, 'currenttopic', '')
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2126 filtered = []
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2127 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	2128 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	2129 # 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	2130 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	2131 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	2132 if len(children) == 1:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2133 c = children[0]
1835 93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	2134 bm = repo._activebookmark
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2135 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	2136 if dryrunopt:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2137 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	2138 if shouldmove:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2139 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	2140 else:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2141 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	2142 if not ret:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2143 lock = tr = None
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2144 try:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2145 lock = repo.lock()
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2146 tr = repo.transaction('next')
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2147 if shouldmove:
2752 4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2148 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	2149 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	2150 else:
1835 93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	2151 bookmarksmod.deactivate(repo)
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2152 tr.close()
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2153 finally:
1742 970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2154 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	2155 displayer.show(c)
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2156 result = 0
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2157 elif children:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2158 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	2159 for c in children:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2160 displayer.show(c)
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2161 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	2162 result = 1
1500 b4dfafda72c2 next: add support for --dry-run timeless@mozdev.org parents: 1499 diff changeset	2163 else:
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2164 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	2165 if topic:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2166 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	2167 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	2168 # 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	2169 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	2170 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	2171 if filtered:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2172 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	2173 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	2174 else:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2175 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	2176 if aspchildren:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2177 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	2178 '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	2179 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	2180 result = 1
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2181 elif 1 < len(aspchildren):
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2182 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	2183 for c in aspchildren:
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2184 displayer.show(repo[c])
1756 a7dcfff8c4a9 evolve: use single quotes in usage messages Martin von Zweigbergk <martinvonz@google.com> parents: 1755 diff changeset	2185 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	2186 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	2187 else:
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2188 cmdutil.bailifchanged(repo)
8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2189 result = _solveone(ui, repo, repo[aspchildren[0]], dryrunopt,
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	2190 False, lambda: None, category='unstable')
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2191 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	2192 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	2193 % 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	2194 return result
1449 9be1cadf7a07 next: add a --evolve option Pierre-Yves David <pierre-yves.david@fb.com> parents: 1448 diff changeset	2195 return 1
1741 8c05184672ae evolve: indent cmdnext and cmdprev ready for locking change (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1739 diff changeset	2196 return result
1742 970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2197 finally:
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244) Simon Farnsworth <simonfar@fb.com> parents: 1741 diff changeset	2198 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	2199
1563 6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2200 def _reachablefrombookmark(repo, revs, bookmarks):
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2201 """filter revisions and bookmarks reachable from the given bookmark
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2202 yoinked from mq.py
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2203 """
1561 dbf1532ee868 evolve: renaming local variables Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1558 diff changeset	2204 repomarks = repo._bookmarks
1563 6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2205 if not bookmarks.issubset(repomarks):
6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2206 raise error.Abort(_("bookmark '%s' not found") %
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	2207 ','.join(sorted(bookmarks - set(repomarks.keys()))))
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2208
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2209 # If the requested bookmark is not the only one pointing to a
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2210 # a revision we have to only delete the bookmark and not strip
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2211 # anything. revsets cannot detect that case.
1563 6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2212 nodetobookmarks = {}
2024 10d80adec0c2 evolve: prevent global variable shadowing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2023 diff changeset	2213 for mark, bnode in repomarks.iteritems():
10d80adec0c2 evolve: prevent global variable shadowing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2023 diff changeset	2214 nodetobookmarks.setdefault(bnode, []).append(mark)
1563 6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2215 for marks in nodetobookmarks.values():
6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2216 if bookmarks.issuperset(marks):
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	2217 rsrevs = repair.stripbmrevset(repo, marks[0])
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	2218 revs = set(revs)
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	2219 revs.update(set(rsrevs))
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	2220 revs = sorted(revs)
1561 dbf1532ee868 evolve: renaming local variables Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1558 diff changeset	2221 return repomarks, revs
dbf1532ee868 evolve: renaming local variables Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1558 diff changeset	2222
1563 6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2223 def _deletebookmark(repo, repomarks, bookmarks):
1501 5c962163f77a prune: ensure we prune bookmarks in a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 1487 diff changeset	2224 wlock = lock = tr = None
5c962163f77a prune: ensure we prune bookmarks in a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 1487 diff changeset	2225 try:
5c962163f77a prune: ensure we prune bookmarks in a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 1487 diff changeset	2226 wlock = repo.wlock()
5c962163f77a prune: ensure we prune bookmarks in a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 1487 diff changeset	2227 lock = repo.lock()
5c962163f77a prune: ensure we prune bookmarks in a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 1487 diff changeset	2228 tr = repo.transaction('prune')
2752 4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2229 bmchanges = []
1563 6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2230 for bookmark in bookmarks:
2752 4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2231 bmchanges.append((bookmark, None))
4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2232 compat.bookmarkapplychanges(repo, tr, bmchanges)
1501 5c962163f77a prune: ensure we prune bookmarks in a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 1487 diff changeset	2233 tr.close()
1563 6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2234 for bookmark in sorted(bookmarks):
6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2235 repo.ui.write(_("bookmark '%s' deleted\n") % bookmark)
1501 5c962163f77a prune: ensure we prune bookmarks in a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 1487 diff changeset	2236 finally:
5c962163f77a prune: ensure we prune bookmarks in a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 1487 diff changeset	2237 lockmod.release(tr, lock, wlock)
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2238
716 4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	2239 def _getmetadata(**opts):
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	2240 metadata = {}
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	2241 date = opts.get('date')
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	2242 user = opts.get('user')
818 fcdd9b8c970b prune: accept '0 0' as a valide --date value Pierre-Yves David <pierre-yves.david@fb.com> parents: 757 diff changeset	2243 if date:
716 4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	2244 metadata['date'] = '%i %i' % util.parsedate(date)
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	2245 if user:
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	2246 metadata['user'] = user
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	2247 return metadata
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	2248
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2249 @eh.command(
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2250 '^prune\|obsolete',
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2251 [('n', 'new', [], _("successor changeset (DEPRECATED)")),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2252 ('s', 'succ', [], _("successor changeset")),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2253 ('r', 'rev', [], _("revisions to prune")),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2254 ('k', 'keep', None, _("does not modify working copy during prune")),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2255 ('', 'biject', False, _("do a 1-1 map between rev and successor ranges")),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2256 ('', 'fold', False,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2257 _("record a fold (multiple precursors, one successors)")),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2258 ('', 'split', False,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2259 _("record a split (on precursor, multiple successors)")),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2260 ('B', 'bookmark', [], _("remove revs only reachable from given"
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2261 " bookmark"))] + metadataopts,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2262 _('[OPTION] [-r] 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	2263 # XXX -U --noupdate option to prevent wc update and or bookmarks update ?
681 eff18fcaaddc prune: improve command function name Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 680 diff changeset	2264 def cmdprune(ui, repo, revs, *opts):
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	2265 """hide changesets by marking them obsolete
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	2266
1574 dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2267 Pruned changesets are obsolete with no successors. If they also have no
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2268 descendants, they are hidden (invisible to all commands).
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2269
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2270 Non-obsolete descendants of pruned changesets become "unstable". Use :hg:`evolve`
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2271 to handle this situation.
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2272
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2273 When you prune the parent of your working copy, Mercurial updates the working
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2274 copy to a non-obsolete parent.
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2275
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2276 You can use ``--succ`` to tell Mercurial that a newer version (successor) of the
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2277 pruned changeset exists. Mercurial records successor revisions in obsolescence
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2278 markers.
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2279
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2280 You can use the ``--biject`` option to specify a 1-1 mapping (bijection) between
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2281 revisions to pruned (precursor) and successor changesets. This option may be
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2282 removed in a future release (with the functionality provided automatically).
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2283
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2284 If you specify multiple revisions in ``--succ``, you are recording a "split" and
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2285 must acknowledge it by passing ``--split``. Similarly, when you prune multiple
dcfe3afe548b evolve: rewrite help for prune command Greg Ward <greg@gerg.ca> parents: 1573 diff changeset	2286 changesets with a single successor, you must pass the ``--fold`` option.
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2287 """
1134 7173c70ab2c3 prune: stop reinjecting all selected revisions back into the revrange Pierre-Yves David <pierre-yves.david@fb.com> parents: 1132 diff changeset	2288 revs = scmutil.revrange(repo, list(revs) + opts.get('rev'))
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2289 succs = opts['new'] + opts['succ']
1564 42c30774e63d prune: changing bookmark argument to be a list Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1563 diff changeset	2290 bookmarks = set(opts.get('bookmark'))
716 4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	2291 metadata = _getmetadata(**opts)
789 0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	2292 biject = opts.get('biject')
1471 4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune` Laurent Charignon <lcharignon@fb.com> parents: 1469 diff changeset	2293 fold = opts.get('fold')
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune` Laurent Charignon <lcharignon@fb.com> parents: 1469 diff changeset	2294 split = opts.get('split')
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune` Laurent Charignon <lcharignon@fb.com> parents: 1469 diff changeset	2295
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune` Laurent Charignon <lcharignon@fb.com> parents: 1469 diff changeset	2296 options = [o for o in ('biject', 'fold', 'split') if opts.get(o)]
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune` Laurent Charignon <lcharignon@fb.com> parents: 1469 diff changeset	2297 if 1 < len(options):
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2298 raise error.Abort(_("can only specify one of %s") % ', '.join(options))
689 d48aae167b9d prune: documentation update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 688 diff changeset	2299
1563 6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2300 if bookmarks:
6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2301 repomarks, revs = _reachablefrombookmark(repo, revs, bookmarks)
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2302 if not revs:
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2303 # no revisions to prune - delete bookmark immediately
1563 6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2304 _deletebookmark(repo, repomarks, bookmarks)
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2305
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2306 if not revs:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2307 raise error.Abort(_('nothing to prune'))
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2308
1295 1ac05eef72ca prune: prune fix transaction pattern Pierre-Yves David <pierre-yves.david@fb.com> parents: 1294 diff changeset	2309 wlock = lock = tr = None
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	2310 try:
1019 0c733dab0036 prune: lock inside the try Pierre-Yves David <pierre-yves.david@fb.com> parents: 1018 diff changeset	2311 wlock = repo.wlock()
444 aedb6b8ace86 drop repo.addobsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	2312 lock = repo.lock()
1294 d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit Durham Goode <durham@fb.com> parents: 1283 diff changeset	2313 tr = repo.transaction('prune')
691 6e63b4185a5c prune: update inline documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 690 diff changeset	2314 # defines pruned changesets
684 19a1a8f93c07 prune: detect bad input Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 683 diff changeset	2315 precs = []
1134 7173c70ab2c3 prune: stop reinjecting all selected revisions back into the revrange Pierre-Yves David <pierre-yves.david@fb.com> parents: 1132 diff changeset	2316 revs.sort()
7173c70ab2c3 prune: stop reinjecting all selected revisions back into the revrange Pierre-Yves David <pierre-yves.david@fb.com> parents: 1132 diff changeset	2317 for p in revs:
684 19a1a8f93c07 prune: detect bad input Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 683 diff changeset	2318 cp = repo[p]
687 6c1fbef2952e prune: test and improve message of immutable aborting. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 685 diff changeset	2319 if not cp.mutable():
927 154510dc4318 evolve: fix grammar in a comment Greg Ward <greg@gerg.ca> parents: 925 diff changeset	2320 # note: createmarkers() would have raised something anyway
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2321 raise error.Abort('cannot prune immutable changeset: %s' % cp,
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	2322 hint="see 'hg help phases' for details")
684 19a1a8f93c07 prune: detect bad input Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 683 diff changeset	2323 precs.append(cp)
19a1a8f93c07 prune: detect bad input Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 683 diff changeset	2324 if not precs:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2325 raise error.Abort('nothing to prune')
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	2326
1682 40d7b0c4abb1 evolve: factor out check for creating unstable commits Siddharth Agarwal <sid0@fb.com> parents: 1681 diff changeset	2327 if _disallowednewunstable(repo, revs):
1778 ba9fabaca91b prune: improve error message if unstable changes are disallowed Pulkit Goyal <7895pulkit@gmail.com> parents: 1777 diff changeset	2328 raise error.Abort(_("cannot prune in the middle of a stack"),
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	2329 hint=_("new unstable changesets are not allowed"))
1397 35f2f54b557c evolve: make prune respect allowunsable Laurent Charignon <lcharignon@fb.com> parents: 1396 diff changeset	2330
691 6e63b4185a5c prune: update inline documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 690 diff changeset	2331 # defines successors changesets
1135 db16c4ad15d0 fixup previous changesets (after forgot to amend). Pierre-Yves David <pierre-yves.david@fb.com> parents: 1134 diff changeset	2332 sucs = scmutil.revrange(repo, succs)
db16c4ad15d0 fixup previous changesets (after forgot to amend). Pierre-Yves David <pierre-yves.david@fb.com> parents: 1134 diff changeset	2333 sucs.sort()
db16c4ad15d0 fixup previous changesets (after forgot to amend). Pierre-Yves David <pierre-yves.david@fb.com> parents: 1134 diff changeset	2334 sucs = tuple(repo[n] for n in sucs)
789 0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	2335 if not biject and len(sucs) > 1 and len(precs) > 1:
684 19a1a8f93c07 prune: detect bad input Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 683 diff changeset	2336 msg = "Can't use multiple successors for multiple precursors"
1687 60752ed8d2d4 prune: suggest --biject in error "hint" Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1686 diff changeset	2337 hint = _("use --biject to mark a series as a replacement"
60752ed8d2d4 prune: suggest --biject in error "hint" Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1686 diff changeset	2338 " for another")
60752ed8d2d4 prune: suggest --biject in error "hint" Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1686 diff changeset	2339 raise error.Abort(msg, hint=hint)
1471 4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune` Laurent Charignon <lcharignon@fb.com> parents: 1469 diff changeset	2340 elif biject and len(sucs) != len(precs):
949 2b2a4ab0eb68 evolve: make most line lenghts 80 characters or less Angel Ezquerra <angel.ezquerra@gmail.com> parents: 948 diff changeset	2341 msg = "Can't use %d successors for %d precursors" \
2b2a4ab0eb68 evolve: make most line lenghts 80 characters or less Angel Ezquerra <angel.ezquerra@gmail.com> parents: 948 diff changeset	2342 % (len(sucs), len(precs))
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2343 raise error.Abort(msg)
1471 4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune` Laurent Charignon <lcharignon@fb.com> parents: 1469 diff changeset	2344 elif (len(precs) == 1 and len(sucs) > 1) and not split:
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune` Laurent Charignon <lcharignon@fb.com> parents: 1469 diff changeset	2345 msg = "please add --split if you want to do a split"
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2346 raise error.Abort(msg)
1471 4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune` Laurent Charignon <lcharignon@fb.com> parents: 1469 diff changeset	2347 elif len(sucs) == 1 and len(precs) > 1 and not fold:
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune` Laurent Charignon <lcharignon@fb.com> parents: 1469 diff changeset	2348 msg = "please add --fold if you want to do a fold"
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2349 raise error.Abort(msg)
1471 4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune` Laurent Charignon <lcharignon@fb.com> parents: 1469 diff changeset	2350 elif biject:
789 0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	2351 relations = [(p, (s,)) for p, s in zip(precs, sucs)]
1471 4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune` Laurent Charignon <lcharignon@fb.com> parents: 1469 diff changeset	2352 else:
4140d680784e evolve: (issue4386) cleanup, split, fold and bijection in `hg prune` Laurent Charignon <lcharignon@fb.com> parents: 1469 diff changeset	2353 relations = [(p, sucs) for p in precs]
789 0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	2354
683 6d24bd455f79 simplify locking in prune Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 682 diff changeset	2355 wdp = repo['.']
931 32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	2356
32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	2357 if len(sucs) == 1 and len(precs) == 1 and wdp in precs:
32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	2358 # '.' killed, so update to the successor
32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	2359 newnode = sucs[0]
32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	2360 else:
32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	2361 # update to an unkilled parent
32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	2362 newnode = wdp
32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	2363
1239 8a06b32061ce evolve: apply prune update before creating obsolescence markers Laurent Charignon <lcharignon@fb.com> parents: 1235 diff changeset	2364 while newnode in precs or newnode.obsolete():
931 32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	2365 newnode = newnode.parents()[0]
32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	2366
683 6d24bd455f79 simplify locking in prune Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 682 diff changeset	2367 if newnode.node() != wdp.node():
1221 524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2368 if opts.get('keep', False):
524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2369 # This is largely the same as the implementation in
524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2370 # strip.stripcmd(). We might want to refactor this somewhere
524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2371 # common at some point.
524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2372
524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2373 # only reset the dirstate for files that would actually change
524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2374 # between the working context and uctx
524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2375 descendantrevs = repo.revs("%d::." % newnode.rev())
524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2376 changedfiles = []
524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2377 for rev in descendantrevs:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2378 # blindly reset the files, regardless of what actually
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2379 # changed
1221 524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2380 changedfiles.extend(repo[rev].files())
524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2381
524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2382 # reset files that only changed in the dirstate too
524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2383 dirstate = repo.dirstate
524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2384 dirchanges = [f for f in dirstate if dirstate[f] != 'n']
524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2385 changedfiles.extend(dirchanges)
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2386 repo.dirstate.rebuild(newnode.node(), newnode.manifest(),
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2387 changedfiles)
1835 93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	2388 dirstate.write(tr)
1221 524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2389 else:
1835 93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	2390 bookactive = repo._activebookmark
1344 376d3df9f47b Merge with stable Laurent Charignon <lcharignon@fb.com> parents: 1341 1342 diff changeset	2391 # Active bookmark that we don't want to delete (with -B option)
376d3df9f47b Merge with stable Laurent Charignon <lcharignon@fb.com> parents: 1341 1342 diff changeset	2392 # we deactivate and move it before the update and reactivate it
376d3df9f47b Merge with stable Laurent Charignon <lcharignon@fb.com> parents: 1341 1342 diff changeset	2393 # after
1563 6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2394 movebookmark = bookactive and not bookmarks
1344 376d3df9f47b Merge with stable Laurent Charignon <lcharignon@fb.com> parents: 1341 1342 diff changeset	2395 if movebookmark:
1835 93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	2396 bookmarksmod.deactivate(repo)
2752 4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2397 bmchanges = [(bookactive, newnode.node())]
4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	2398 compat.bookmarkapplychanges(repo, tr, bmchanges)
1221 524dbc8ffeac prune: add --keep to not touch the working copy Durham Goode <durham@fb.com> parents: 1220 diff changeset	2399 commands.update(ui, repo, newnode.rev())
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	2400 ui.status(_('working directory now at %s\n')
2442 a8fea2ae3c0b prune: prevent a color related crash when the working copy is moved Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2416 diff changeset	2401 % ui.label(str(newnode), 'evolve.node'))
1344 376d3df9f47b Merge with stable Laurent Charignon <lcharignon@fb.com> parents: 1341 1342 diff changeset	2402 if movebookmark:
1835 93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	2403 bookmarksmod.activate(repo, bookactive)
1342 16017e1bb2a1 prune: with active bookmark should stay active Laurent Charignon <lcharignon@fb.com> parents: 1340 diff changeset	2404
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	2405 # update bookmarks
1563 6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2406 if bookmarks:
6a9f0261b181 prune: remove a list of bookmarks Shubhanshu Agrawal <agrawal.shubhanshu@gmail.com> parents: 1561 diff changeset	2407 _deletebookmark(repo, repomarks, bookmarks)
1239 8a06b32061ce evolve: apply prune update before creating obsolescence markers Laurent Charignon <lcharignon@fb.com> parents: 1235 diff changeset	2408
8a06b32061ce evolve: apply prune update before creating obsolescence markers Laurent Charignon <lcharignon@fb.com> parents: 1235 diff changeset	2409 # create markers
8a06b32061ce evolve: apply prune update before creating obsolescence markers Laurent Charignon <lcharignon@fb.com> parents: 1235 diff changeset	2410 obsolete.createmarkers(repo, relations, metadata=metadata)
1468 bc6cf6cc06fd evolve: remove trailing spaces André Sintzoff <andre.sintzoff@gmail.com> parents: 1467 diff changeset	2411
1239 8a06b32061ce evolve: apply prune update before creating obsolescence markers Laurent Charignon <lcharignon@fb.com> parents: 1235 diff changeset	2412 # informs that changeset have been pruned
8a06b32061ce evolve: apply prune update before creating obsolescence markers Laurent Charignon <lcharignon@fb.com> parents: 1235 diff changeset	2413 ui.status(_('%i changesets pruned\n') % len(precs))
8a06b32061ce evolve: apply prune update before creating obsolescence markers Laurent Charignon <lcharignon@fb.com> parents: 1235 diff changeset	2414
693 d3c1fe0035d1 prune: handle bookmark Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 691 diff changeset	2415 for ctx in repo.unfiltered().set('bookmark() and %ld', precs):
1101 8cac667a0d7d prune: work around lazy revset slowdown Pierre-Yves David <pierre-yves.david@fb.com> parents: 1099 diff changeset	2416 # used to be:
8cac667a0d7d prune: work around lazy revset slowdown Pierre-Yves David <pierre-yves.david@fb.com> parents: 1099 diff changeset	2417 #
8cac667a0d7d prune: work around lazy revset slowdown Pierre-Yves David <pierre-yves.david@fb.com> parents: 1099 diff changeset	2418 # ldest = list(repo.set('max((::%d) - obsolete())', ctx))
8cac667a0d7d prune: work around lazy revset slowdown Pierre-Yves David <pierre-yves.david@fb.com> parents: 1099 diff changeset	2419 # if ldest:
8cac667a0d7d prune: work around lazy revset slowdown Pierre-Yves David <pierre-yves.david@fb.com> parents: 1099 diff changeset	2420 # c = ldest[0]
8cac667a0d7d prune: work around lazy revset slowdown Pierre-Yves David <pierre-yves.david@fb.com> parents: 1099 diff changeset	2421 #
8cac667a0d7d prune: work around lazy revset slowdown Pierre-Yves David <pierre-yves.david@fb.com> parents: 1099 diff changeset	2422 # but then revset took a lazy arrow in the knee and became much
8cac667a0d7d prune: work around lazy revset slowdown Pierre-Yves David <pierre-yves.david@fb.com> parents: 1099 diff changeset	2423 # slower. The new forms makes as much sense and a much faster.
8cac667a0d7d prune: work around lazy revset slowdown Pierre-Yves David <pierre-yves.david@fb.com> parents: 1099 diff changeset	2424 for dest in ctx.ancestors():
8cac667a0d7d prune: work around lazy revset slowdown Pierre-Yves David <pierre-yves.david@fb.com> parents: 1099 diff changeset	2425 if not dest.obsolete():
1506 a55c691f4cc0 evolve: use repo._bookmarks.recordchange instead of repo._bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1505 diff changeset	2426 updatebookmarks = _bookmarksupdater(repo, ctx.node(), tr)
1101 8cac667a0d7d prune: work around lazy revset slowdown Pierre-Yves David <pierre-yves.david@fb.com> parents: 1099 diff changeset	2427 updatebookmarks(dest.node())
8cac667a0d7d prune: work around lazy revset slowdown Pierre-Yves David <pierre-yves.david@fb.com> parents: 1099 diff changeset	2428 break
1294 d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit Durham Goode <durham@fb.com> parents: 1283 diff changeset	2429
d1c29db2e055 prune: fix pruning w/ bookmarks and inhibit Durham Goode <durham@fb.com> parents: 1283 diff changeset	2430 tr.close()
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	2431 finally:
1295 1ac05eef72ca prune: prune fix transaction pattern Pierre-Yves David <pierre-yves.david@fb.com> parents: 1294 diff changeset	2432 lockmod.release(tr, lock, wlock)
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	2433
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2434 @eh.wrapcommand('commit')
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	2435 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	2436 tr = None
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2437 if kwargs.get('amend', False):
1255 a2d4901e211e commit: avoid potential deadlock Pierre-Yves David <pierre-yves.david@fb.com> parents: 1253 diff changeset	2438 wlock = lock = None
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2439 else:
1255 a2d4901e211e commit: avoid potential deadlock Pierre-Yves David <pierre-yves.david@fb.com> parents: 1253 diff changeset	2440 wlock = repo.wlock()
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2441 lock = repo.lock()
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2442 try:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2443 obsoleted = kwargs.get('obsolete', [])
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2444 if obsoleted:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2445 obsoleted = repo.set('%lr', obsoleted)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2446 result = orig(ui, repo, arg, *kwargs)
1659 c450d134aac4 Spelling: succeeded timeless@gmail.com parents: 1646 diff changeset	2447 if not result: # commit succeeded
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2448 new = repo['-1']
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2449 oldbookmarks = []
444 aedb6b8ace86 drop repo.addobsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	2450 markers = []
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2451 for old in obsoleted:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2452 oldbookmarks.extend(repo.nodebookmarks(old.node()))
444 aedb6b8ace86 drop repo.addobsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	2453 markers.append((old, (new,)))
aedb6b8ace86 drop repo.addobsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	2454 if markers:
1070 527b12a59628 drop relevant marker compat Pierre-Yves David <pierre-yves.david@fb.com> parents: 1069 diff changeset	2455 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	2456 bmchanges = []
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2457 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	2458 bmchanges.append((book, new.node()))
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2459 if oldbookmarks:
1558 4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2460 if not wlock:
4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2461 wlock = repo.wlock()
4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2462 if not lock:
4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2463 lock = repo.lock()
4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2464 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	2465 compat.bookmarkapplychanges(repo, tr, bmchanges)
1558 4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2466 tr.close()
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2467 return result
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	2468 finally:
1558 4706475e0c5d commitwrapper: use bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1557 diff changeset	2469 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	2470
2667 e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2659 diff changeset	2471 def presplitupdate(repo, ui, prev, ctx):
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2659 diff changeset	2472 """prepare the working directory for a split (for topic hooking)
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2659 diff changeset	2473 """
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2659 diff changeset	2474 hg.update(repo, prev)
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2659 diff changeset	2475 commands.revert(ui, repo, rev=ctx.rev(), all=True)
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2659 diff changeset	2476
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2477 @eh.command(
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2478 '^split',
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2479 [('r', 'rev', [], _("revision to split")),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2480 ] + commitopts + commitopts2,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2481 _('hg split [OPTION]... [-r] REV'))
1478 9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2482 def cmdsplit(ui, repo, revs, *opts):
1575 0c8548df67fe merge with stable Pierre-Yves David <pierre-yves.david@fb.com> parents: 1568 1574 diff changeset	2483 """split a changeset into smaller changesets
1573 0b4cec85d4ab evolve: improve help for split command Greg Ward <greg@gerg.ca> parents: 1572 diff changeset	2484
0b4cec85d4ab evolve: improve help for split command Greg Ward <greg@gerg.ca> parents: 1572 diff changeset	2485 By default, split the current revision by prompting for all its hunks to be
1478 9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2486 redistributed into new changesets.
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2487
1573 0b4cec85d4ab evolve: improve help for split command Greg Ward <greg@gerg.ca> parents: 1572 diff changeset	2488 Use --rev to split a given changeset instead.
1478 9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2489 """
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2490 tr = wlock = lock = None
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2491 newcommits = []
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2492
1598 2a08ef812b84 evolve: make split respect rev args passed without --rev or -r Kostia Balytskyi <ikostia@fb.com> parents: 1597 diff changeset	2493 revarg = (list(revs) + opts.get('rev')) or ['.']
2a08ef812b84 evolve: make split respect rev args passed without --rev or -r Kostia Balytskyi <ikostia@fb.com> parents: 1597 diff changeset	2494 if len(revarg) != 1:
2a08ef812b84 evolve: make split respect rev args passed without --rev or -r Kostia Balytskyi <ikostia@fb.com> parents: 1597 diff changeset	2495 msg = _("more than one revset is given")
2a08ef812b84 evolve: make split respect rev args passed without --rev or -r Kostia Balytskyi <ikostia@fb.com> parents: 1597 diff changeset	2496 hnt = _("use either `hg split <rs>` or `hg split --rev <rs>`, not both")
2a08ef812b84 evolve: make split respect rev args passed without --rev or -r Kostia Balytskyi <ikostia@fb.com> parents: 1597 diff changeset	2497 raise error.Abort(msg, hint=hnt)
2a08ef812b84 evolve: make split respect rev args passed without --rev or -r Kostia Balytskyi <ikostia@fb.com> parents: 1597 diff changeset	2498
2a08ef812b84 evolve: make split respect rev args passed without --rev or -r Kostia Balytskyi <ikostia@fb.com> parents: 1597 diff changeset	2499 rev = scmutil.revsingle(repo, revarg[0])
1478 9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2500 try:
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2501 wlock = repo.wlock()
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2502 lock = repo.lock()
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2503 cmdutil.bailifchanged(repo)
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2504 tr = repo.transaction('split')
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2505 ctx = repo[rev]
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2506 r = ctx.rev()
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2507 disallowunstable = not obsolete.isenabled(repo,
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2508 obsolete.allowunstableopt)
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2509 if disallowunstable:
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2510 # XXX We should check head revs
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2511 if repo.revs("(%d::) - %d", rev, rev):
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2512 raise error.Abort(_("cannot split commit: %s not a head") % ctx)
1478 9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2513
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2514 if len(ctx.parents()) > 1:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2515 raise error.Abort(_("cannot split merge commits"))
1478 9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2516 prev = ctx.p1()
1506 a55c691f4cc0 evolve: use repo._bookmarks.recordchange instead of repo._bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 1505 diff changeset	2517 bmupdate = _bookmarksupdater(repo, ctx.node(), tr)
1835 93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	2518 bookactive = repo._activebookmark
1485 1ba64be11bf8 split: handle bookmarks instead of leaving them on precursor Laurent Charignon <lcharignon@fb.com> parents: 1484 diff changeset	2519 if bookactive is not None:
1835 93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	2520 repo.ui.status(_("(leaving bookmark %s)\n") % repo._activebookmark)
93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	2521 bookmarksmod.deactivate(repo)
2667 e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2659 diff changeset	2522
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2659 diff changeset	2523 # Prepare the working directory
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2659 diff changeset	2524 presplitupdate(repo, ui, prev, 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	2525
1478 9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2526 def haschanges():
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2527 modified, added, removed, deleted = repo.status()[:4]
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2528 return modified or added or removed or deleted
1675 48c3a472aec7 split: rewrite the pre-split commit message Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 1669 diff changeset	2529 msg = ("HG: This is the original pre-split commit message. "
48c3a472aec7 split: rewrite the pre-split commit message Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 1669 diff changeset	2530 "Edit it as appropriate.\n\n")
1531 47f48af730ce split: preserve original changesets description Pierre-Yves David <pierre-yves.david@fb.com> parents: 1528 diff changeset	2531 msg += ctx.description()
47f48af730ce split: preserve original changesets description Pierre-Yves David <pierre-yves.david@fb.com> parents: 1528 diff changeset	2532 opts['message'] = msg
47f48af730ce split: preserve original changesets description Pierre-Yves David <pierre-yves.david@fb.com> parents: 1528 diff changeset	2533 opts['edit'] = True
2659 166ca0aba0ea split: preserve author of the original changeset in the successors Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2658 diff changeset	2534 opts['user'] = ctx.user()
1478 9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2535 while haschanges():
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2536 pats = ()
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2537 cmdutil.dorecord(ui, repo, commands.commit, 'commit', False,
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2538 cmdutil.recordfilter, pats, *opts)
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2539 # TODO: Does no seem like the best way to do this
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2540 # We should make dorecord return the newly created commit
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2541 newcommits.append(repo['.'])
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2542 if haschanges():
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2543 if ui.prompt('Done splitting? [yN]', default='n') == 'y':
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2544 commands.commit(ui, repo, **opts)
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2545 newcommits.append(repo['.'])
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2546 break
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2547 else:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2548 ui.status(_("no more change to split\n"))
1478 9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2549
1739 904ae1b2087b split: avoid trying to split an empty commit (issue5191) Philippe Pepiot <philippe.pepiot@logilab.fr> parents: 1735 diff changeset	2550 if newcommits:
904ae1b2087b split: avoid trying to split an empty commit (issue5191) Philippe Pepiot <philippe.pepiot@logilab.fr> parents: 1735 diff changeset	2551 tip = repo[newcommits[-1]]
904ae1b2087b split: avoid trying to split an empty commit (issue5191) Philippe Pepiot <philippe.pepiot@logilab.fr> parents: 1735 diff changeset	2552 bmupdate(tip.node())
904ae1b2087b split: avoid trying to split an empty commit (issue5191) Philippe Pepiot <philippe.pepiot@logilab.fr> parents: 1735 diff changeset	2553 if bookactive is not None:
1835 93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	2554 bookmarksmod.activate(repo, bookactive)
1739 904ae1b2087b split: avoid trying to split an empty commit (issue5191) Philippe Pepiot <philippe.pepiot@logilab.fr> parents: 1735 diff changeset	2555 obsolete.createmarkers(repo, [(repo[r], newcommits)])
1478 9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2556 tr.close()
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2557 finally:
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2558 lockmod.release(tr, lock, wlock)
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2559
9603aa1ecdfd evolve: add a command to split commits Laurent Charignon <lcharignon@fb.com> parents: 1471 diff changeset	2560
1220 71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2561 @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	2562 ('', '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	2563 "backup bundle")),
1220 71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2564 ])
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2565 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	2566 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	2567 kwargs.get('bundle', False)):
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2568 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	2569
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2570 if kwargs.get('force'):
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2571 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	2572 "enabled\n"))
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2573 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	2574 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	2575 "evolve enabled\n"))
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2576
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2577 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	2578 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	2579 revs = repo.revs("(%ld)::", revs)
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2580 kwargs['rev'] = []
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2581 kwargs['new'] = []
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2582 kwargs['succ'] = []
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2583 kwargs['biject'] = False
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2584 return cmdprune(ui, repo, revs, *kwargs)
71240f696f26 strip: add the option for wrapping the strip command Durham Goode <durham@fb.com> parents: 1219 diff changeset	2585
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2586 @eh.command(
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2587 '^touch',
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2588 [('r', 'rev', [], 'revision to update'),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2589 ('D', 'duplicate', False,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2590 'do not mark the new revision as successor of the old one'),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2591 ('A', 'allowdivergence', False,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2592 'mark the new revision as successor of the old one potentially creating '
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2593 'divergence')],
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2594 # allow to choose the seed ?
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2595 _('[-r] revs'))
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	2596 def touch(ui, repo, revs, *opts):
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2597 """create successors that are identical to their predecessors except
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2598 for the changeset ID
517 0bc0c9edcb15 evolve: usual syntax/grammar errors/long lines cleanup Patrick Mezard <patrick@mezard.eu> parents: 516 diff changeset	2599
0bc0c9edcb15 evolve: usual syntax/grammar errors/long lines cleanup Patrick Mezard <patrick@mezard.eu> parents: 516 diff changeset	2600 This is used to "resurrect" changesets
0bc0c9edcb15 evolve: usual syntax/grammar errors/long lines cleanup Patrick Mezard <patrick@mezard.eu> parents: 516 diff changeset	2601 """
701 f752089479ce add a duplicate option in touch Denis Laxalde <denis.laxalde@logilab.fr> parents: 699 diff changeset	2602 duplicate = opts['duplicate']
1589 d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2603 allowdivergence = opts['allowdivergence']
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	2604 revs = list(revs)
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	2605 revs.extend(opts['rev'])
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	2606 if not revs:
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	2607 revs = ['.']
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	2608 revs = scmutil.revrange(repo, revs)
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	2609 if not revs:
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	2610 ui.write_err('no revision to touch\n')
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	2611 return 1
701 f752089479ce add a duplicate option in touch Denis Laxalde <denis.laxalde@logilab.fr> parents: 699 diff changeset	2612 if not duplicate and repo.revs('public() and %ld', revs):
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2613 raise error.Abort("can't touch public revision")
1589 d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2614 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
1308 676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2615 wlock = lock = tr = None
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	2616 try:
514 ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	2617 wlock = repo.wlock()
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	2618 lock = repo.lock()
514 ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	2619 tr = repo.transaction('touch')
702 b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	2620 revs.sort() # ensure parent are run first
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	2621 newmapping = {}
1308 676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2622 for r in revs:
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2623 ctx = repo[r]
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2624 extra = ctx.extra().copy()
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2625 extra['__touch-noise__'] = random.randint(0, 0xffffffff)
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2626 # search for touched parent
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2627 p1 = ctx.p1().node()
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2628 p2 = ctx.p2().node()
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2629 p1 = newmapping.get(p1, p1)
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2630 p2 = newmapping.get(p2, p2)
1589 d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2631
d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2632 if not (duplicate or allowdivergence):
d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2633 # The user hasn't yet decided what to do with the revived
d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2634 # cset, let's ask
2693 f4b0351fa813 evolve: adapt to function migrate to obsutil Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2689 diff changeset	2635 sset = compat.successorssets(repo, ctx.node())
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	2636 nodivergencerisk = (len(sset) == 0 or
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	2637 (len(sset) == 1 and
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	2638 len(sset[0]) == 1 and
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	2639 repo[sset[0][0]].rev() == ctx.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	2640 ))
1589 d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2641 if nodivergencerisk:
d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2642 duplicate = False
d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2643 else:
d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2644 displayer.show(ctx)
d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2645 index = ui.promptchoice(
d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2646 _("reviving this changeset will create divergence"
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	2647 " unless you make a duplicate.\n(a)llow divergence or"
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	2648 " (d)uplicate the changeset? $$ &Allowdivergence $$ "
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	2649 "&Duplicate"), 0)
1589 d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2650 choice = ['allowdivergence', 'duplicate'][index]
d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2651 if choice == 'allowdivergence':
d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2652 duplicate = False
d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2653 else:
d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2654 duplicate = True
d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2655
1308 676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2656 new, unusedvariable = rewrite(repo, ctx, [], ctx,
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2657 [p1, p2],
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2658 commitopts={'extra': extra})
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2659 # store touched version to help potential children
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2660 newmapping[ctx.node()] = new
1589 d6630a6bff86 touch: prompt the user for what to do with the revived changeset Laurent Charignon <lcharignon@fb.com> parents: 1580 diff changeset	2661
1308 676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2662 if not duplicate:
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2663 obsolete.createmarkers(repo, [(ctx, (repo[new],))])
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2664 phases.retractboundary(repo, tr, ctx.phase(), [new])
676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2665 if ctx in repo[None].parents():
2465 479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	2666 with repo.dirstate.parentchange():
479646a3873a deprecation: fix dirstate.beginparentchange deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2460 diff changeset	2667 repo.dirstate.setparents(new, node.nullid)
1308 676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2668 tr.close()
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	2669 finally:
1308 676d88a82d4a evolve: improve transaction related code to use the lock module Laurent Charignon <lcharignon@fb.com> parents: 1307 diff changeset	2670 lockmod.release(tr, lock, wlock)
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	2671
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2672 @eh.command(
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2673 '^fold\|squash',
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2674 [('r', 'rev', [], _("revision to fold")),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2675 ('', 'exact', None, _("only fold specified revisions")),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2676 ('', 'from', None, _("fold revisions linearly to working copy parent"))
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2677 ] + commitopts + commitopts2,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2678 _('hg fold [OPTION]... [-r] REV'))
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	2679 def fold(ui, repo, revs, *opts):
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2680 """fold multiple revisions into a single one
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2681
1781 a046e78c3290 fold: require --from flag for folding revisions to working copy Martin von Zweigbergk <martinvonz@google.com> parents: 1780 diff changeset	2682 With --from, folds all the revisions linearly between the given revisions
1463 71a3aa0349c5 evolve: improve the help of the fold command Laurent Charignon <lcharignon@fb.com> parents: 1460 diff changeset	2683 and the parent of the working directory.
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2684
1781 a046e78c3290 fold: require --from flag for folding revisions to working copy Martin von Zweigbergk <martinvonz@google.com> parents: 1780 diff changeset	2685 With --exact, folds only the specified revisions while ignoring the
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2686 parent of the working directory. In this case, the given revisions must
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2687 form a linear unbroken chain.
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2688
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2689 .. container:: verbose
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2690
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2691 Some examples:
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2692
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2693 - Fold the current revision with its parent::
702 b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	2694
1781 a046e78c3290 fold: require --from flag for folding revisions to working copy Martin von Zweigbergk <martinvonz@google.com> parents: 1780 diff changeset	2695 hg fold --from .^
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2696
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2697 - Fold all draft revisions with working directory parent::
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2698
1781 a046e78c3290 fold: require --from flag for folding revisions to working copy Martin von Zweigbergk <martinvonz@google.com> parents: 1780 diff changeset	2699 hg fold --from 'draft()'
702 b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	2700
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2701 See :hg:`help phases` for more about draft revisions and
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2702 :hg:`help revsets` for more about the `draft()` keyword
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2703
1469 fa1a27009c76 evolve: fix typo in fold docstring André Sintzoff <andre.sintzoff@gmail.com> parents: 1468 diff changeset	2704 - Fold revisions between 3 and 6 with the working directory parent::
1464 d830d4e9f212 fold: avoid using x:y in the help Pierre-Yves David <pierre-yves.david@fb.com> parents: 1463 diff changeset	2705
1781 a046e78c3290 fold: require --from flag for folding revisions to working copy Martin von Zweigbergk <martinvonz@google.com> parents: 1780 diff changeset	2706 hg fold --from 3::6
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2707
1463 71a3aa0349c5 evolve: improve the help of the fold command Laurent Charignon <lcharignon@fb.com> parents: 1460 diff changeset	2708 - Fold revisions 3 and 4:
71a3aa0349c5 evolve: improve the help of the fold command Laurent Charignon <lcharignon@fb.com> parents: 1460 diff changeset	2709
71a3aa0349c5 evolve: improve the help of the fold command Laurent Charignon <lcharignon@fb.com> parents: 1460 diff changeset	2710 hg fold "3 + 4" --exact
71a3aa0349c5 evolve: improve the help of the fold command Laurent Charignon <lcharignon@fb.com> parents: 1460 diff changeset	2711
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2712 - Only fold revisions linearly between foo and @::
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2713
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2714 hg fold foo::@ --exact
702 b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	2715 """
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	2716 revs = list(revs)
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2717 revs.extend(opts['rev'])
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	2718 if not revs:
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2719 raise error.Abort(_('no revisions specified'))
995 0f3a7efd6ee9 fold: emit error message when folding a single revision Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 994 diff changeset	2720
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2721 revs = scmutil.revrange(repo, revs)
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2722
1781 a046e78c3290 fold: require --from flag for folding revisions to working copy Martin von Zweigbergk <martinvonz@google.com> parents: 1780 diff changeset	2723 if opts['from'] and opts['exact']:
a046e78c3290 fold: require --from flag for folding revisions to working copy Martin von Zweigbergk <martinvonz@google.com> parents: 1780 diff changeset	2724 raise error.Abort(_('cannot use both --from and --exact'))
a046e78c3290 fold: require --from flag for folding revisions to working copy Martin von Zweigbergk <martinvonz@google.com> parents: 1780 diff changeset	2725 elif opts['from']:
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2726 # Try to extend given revision starting from the working directory
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2727 extrevs = repo.revs('(%ld::.) or (.::%ld)', revs, revs)
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2728 discardedrevs = [r for r in revs if r not in extrevs]
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2729 if discardedrevs:
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	2730 msg = _("cannot fold non-linear revisions")
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	2731 hint = _("given revisions are unrelated to parent of 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	2732 " directory")
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	2733 raise error.Abort(msg, hint=hint)
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2734 revs = extrevs
1781 a046e78c3290 fold: require --from flag for folding revisions to working copy Martin von Zweigbergk <martinvonz@google.com> parents: 1780 diff changeset	2735 elif opts['exact']:
a046e78c3290 fold: require --from flag for folding revisions to working copy Martin von Zweigbergk <martinvonz@google.com> parents: 1780 diff changeset	2736 # Nothing to do; "revs" is already set correctly
a046e78c3290 fold: require --from flag for folding revisions to working copy Martin von Zweigbergk <martinvonz@google.com> parents: 1780 diff changeset	2737 pass
a046e78c3290 fold: require --from flag for folding revisions to working copy Martin von Zweigbergk <martinvonz@google.com> parents: 1780 diff changeset	2738 else:
a046e78c3290 fold: require --from flag for folding revisions to working copy Martin von Zweigbergk <martinvonz@google.com> parents: 1780 diff changeset	2739 raise error.Abort(_('must specify either --from or --exact'))
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	2740
1784 c3741a5adbb0 fold: cleanly abort on empty fold set (issue5453) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1765 diff changeset	2741 if not revs:
c3741a5adbb0 fold: cleanly abort on empty fold set (issue5453) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1765 diff changeset	2742 raise error.Abort(_('specified revisions evaluate to an empty set'),
c3741a5adbb0 fold: cleanly abort on empty fold set (issue5453) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1765 diff changeset	2743 hint=_('use different revision arguments'))
c3741a5adbb0 fold: cleanly abort on empty fold set (issue5453) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1765 diff changeset	2744 elif len(revs) == 1:
995 0f3a7efd6ee9 fold: emit error message when folding a single revision Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 994 diff changeset	2745 ui.write_err(_('single revision specified, nothing to fold\n'))
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	2746 return 1
995 0f3a7efd6ee9 fold: emit error message when folding a single revision Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 994 diff changeset	2747
515 0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	2748 wlock = lock = None
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	2749 try:
515 0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	2750 wlock = repo.wlock()
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	2751 lock = repo.lock()
1685 73e0018c423f fold: move sanity check after locking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1684 diff changeset	2752
73e0018c423f fold: move sanity check after locking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1684 diff changeset	2753 root, head = _foldcheck(repo, revs)
73e0018c423f fold: move sanity check after locking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1684 diff changeset	2754
1780 39ef492603c6 fold: use 'fold', not 'touch', for transaction description Martin von Zweigbergk <martinvonz@google.com> parents: 1778 diff changeset	2755 tr = repo.transaction('fold')
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	2756 try:
915 1ebe5c51919b fold: enable --date and --user options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 912 diff changeset	2757 commitopts = opts.copy()
515 0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	2758 allctx = [repo[r] for r in revs]
0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	2759 targetphase = max(c.phase() for c in allctx)
933 e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	2760
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	2761 if commitopts.get('message') or commitopts.get('logfile'):
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	2762 commitopts['edit'] = False
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	2763 else:
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	2764 msgs = ["HG: This is a fold of %d changesets." % len(allctx)]
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	2765 msgs += ["HG: Commit message of changeset %s.\n\n%s\n" %
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	2766 (c.rev(), c.description()) for c in allctx]
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	2767 commitopts['message'] = "\n".join(msgs)
933 e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	2768 commitopts['edit'] = True
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	2769
993 8a4a8fe50c26 evolve: do not use _ as an unused variable Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 988 diff changeset	2770 newid, unusedvariable = rewrite(repo, root, allctx, head,
1547 425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2771 [root.p1().node(),
425c0700aabd check-code: make evolve.py comply with check-code Laurent Charignon <lcharignon@fb.com> parents: 1536 diff changeset	2772 root.p2().node()],
993 8a4a8fe50c26 evolve: do not use _ as an unused variable Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 988 diff changeset	2773 commitopts=commitopts)
1069 356552e55489 evolve: always use the transaction version of phase movement Pierre-Yves David <pierre-yves.david@fb.com> parents: 1068 diff changeset	2774 phases.retractboundary(repo, tr, targetphase, [newid])
1070 527b12a59628 drop relevant marker compat Pierre-Yves David <pierre-yves.david@fb.com> parents: 1069 diff changeset	2775 obsolete.createmarkers(repo, [(ctx, (repo[newid],))
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	2776 for ctx in allctx])
515 0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	2777 tr.close()
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	2778 finally:
515 0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	2779 tr.release()
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	2780 ui.status('%i changesets folded\n' % len(revs))
632 cb0807646f5a fold: work around potential bug with filtering Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 631 diff changeset	2781 if repo['.'].rev() in revs:
549 b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 548 diff changeset	2782 hg.update(repo, newid)
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	2783 finally:
515 0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	2784 lockmod.release(lock, wlock)
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	2785
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2786 @eh.command(
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2787 '^metaedit',
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2788 [('r', 'rev', [], _("revision to edit")),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2789 ('', 'fold', None, _("also fold specified revisions into one")),
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2790 ] + commitopts + commitopts2,
c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2791 _('hg metaedit [OPTION]... [-r] [REV]'))
1683 4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2792 def metaedit(ui, repo, revs, *opts):
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2793 """edit commit information
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2794
1684 474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2795 Edits the commit information for the specified revisions. By default, edits
1683 4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2796 commit information for the working directory parent.
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2797
1684 474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2798 With --fold, also folds multiple revisions into one if necessary. In this
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2799 case, the given revisions must form a linear unbroken chain.
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2800
1683 4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2801 .. container:: verbose
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2802
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2803 Some examples:
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2804
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2805 - Edit the commit message for the working directory parent::
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2806
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2807 hg metaedit
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2808
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2809 - Change the username for the working directory parent::
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2810
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2811 hg metaedit --user 'New User <new-email@example.com>'
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2812
1684 474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2813 - Combine all draft revisions that are ancestors of foo but not of @ into
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2814 one::
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2815
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2816 hg metaedit --fold 'draft() and only(foo,@)'
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2817
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2818 See :hg:`help phases` for more about draft revisions, and
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2819 :hg:`help revsets` for more about the `draft()` and `only()` keywords.
1683 4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2820 """
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2821 revs = list(revs)
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2822 revs.extend(opts['rev'])
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2823 if not revs:
1684 474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2824 if opts['fold']:
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2825 raise error.Abort(_('revisions must be specified with --fold'))
1683 4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2826 revs = ['.']
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2827
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2828 wlock = lock = None
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2829 try:
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2830 wlock = repo.wlock()
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2831 lock = repo.lock()
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2832
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2833 revs = scmutil.revrange(repo, revs)
1684 474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2834 if not opts['fold'] and len(revs) > 1:
1683 4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2835 # TODO: handle multiple revisions. This is somewhat tricky because
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2836 # if we want to edit a series of commits:
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2837 #
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2838 # a ---- b ---- c
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2839 #
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2840 # we need to rewrite a first, then directly rewrite b on top of the
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2841 # new a, then rewrite c on top of the new b. So we need to handle
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2842 # revisions in topological order.
1684 474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2843 raise error.Abort(_('editing multiple revisions without --fold is '
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2844 'not currently supported'))
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2845
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2846 if opts['fold']:
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2847 root, head = _foldcheck(repo, revs)
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2848 else:
1686 031682c1faa2 metaedit: check for public changeset before instability Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1685 diff changeset	2849 if repo.revs("%ld and public()", revs):
031682c1faa2 metaedit: check for public changeset before instability Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1685 diff changeset	2850 raise error.Abort(_('cannot edit commit information for public '
031682c1faa2 metaedit: check for public changeset before instability Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1685 diff changeset	2851 'revisions'))
1684 474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2852 newunstable = _disallowednewunstable(repo, revs)
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2853 if newunstable:
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	2854 msg = _('cannot edit commit information in the middle'
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	2855 ' of a stack')
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	2856 hint = _('%s will become unstable and new unstable changes'
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	2857 ' are not allowed')
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	2858 hint %= repo[newunstable.first()]
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	2859 raise error.Abort(msg, hint=hint)
1684 474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2860 root = head = repo[revs.first()]
1683 4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2861
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2862 wctx = repo[None]
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2863 p1 = wctx.p1()
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2864 tr = repo.transaction('metaedit')
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2865 newp1 = None
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2866 try:
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2867 commitopts = opts.copy()
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2868 allctx = [repo[r] for r in revs]
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2869 targetphase = max(c.phase() for c in allctx)
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2870
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2871 if commitopts.get('message') or commitopts.get('logfile'):
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2872 commitopts['edit'] = False
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2873 else:
1684 474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2874 if opts['fold']:
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2875 msgs = ["HG: This is a fold of %d changesets." % len(allctx)]
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2876 msgs += ["HG: Commit message of changeset %s.\n\n%s\n" %
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2877 (c.rev(), c.description()) for c in allctx]
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2878 else:
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2879 msgs = [head.description()]
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	2880 commitopts['message'] = "\n".join(msgs)
1683 4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2881 commitopts['edit'] = True
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2882
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2883 # TODO: if the author and message are the same, don't create a new
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2884 # hash. Right now we create a new hash because the date can be
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2885 # different.
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2886 newid, created = rewrite(repo, root, allctx, head,
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2887 [root.p1().node(), root.p2().node()],
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2888 commitopts=commitopts)
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2889 if created:
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2890 if p1.rev() in revs:
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2891 newp1 = newid
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2892 phases.retractboundary(repo, tr, targetphase, [newid])
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2893 obsolete.createmarkers(repo, [(ctx, (repo[newid],))
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2894 for ctx in allctx])
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2895 else:
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2896 ui.status(_("nothing changed\n"))
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2897 tr.close()
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2898 finally:
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2899 tr.release()
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2900
1684 474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2901 if opts['fold']:
474db2d60202 metaedit: add support for folding commits while editing their metadata Siddharth Agarwal <sid0@fb.com> parents: 1683 diff changeset	2902 ui.status('%i changesets folded\n' % len(revs))
1683 4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2903 if newp1 is not None:
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2904 hg.update(repo, newp1)
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2905 finally:
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2906 lockmod.release(lock, wlock)
4fd0db2f6d84 commands: introduce a new command to edit commit metadata Siddharth Agarwal <sid0@fb.com> parents: 1682 diff changeset	2907
1681 1b1c8c0ab20e evolve: factor out sanity checks for folds Siddharth Agarwal <sid0@fb.com> parents: 1680 diff changeset	2908 def _foldcheck(repo, revs):
1b1c8c0ab20e evolve: factor out sanity checks for folds Siddharth Agarwal <sid0@fb.com> parents: 1680 diff changeset	2909 roots = repo.revs('roots(%ld)', revs)
1b1c8c0ab20e evolve: factor out sanity checks for folds Siddharth Agarwal <sid0@fb.com> parents: 1680 diff changeset	2910 if len(roots) > 1:
1b1c8c0ab20e evolve: factor out sanity checks for folds Siddharth Agarwal <sid0@fb.com> parents: 1680 diff changeset	2911 raise error.Abort(_("cannot fold non-linear revisions "
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	2912 "(multiple roots given)"))
1681 1b1c8c0ab20e evolve: factor out sanity checks for folds Siddharth Agarwal <sid0@fb.com> parents: 1680 diff changeset	2913 root = repo[roots.first()]
1b1c8c0ab20e evolve: factor out sanity checks for folds Siddharth Agarwal <sid0@fb.com> parents: 1680 diff changeset	2914 if root.phase() <= phases.public:
1b1c8c0ab20e evolve: factor out sanity checks for folds Siddharth Agarwal <sid0@fb.com> parents: 1680 diff changeset	2915 raise error.Abort(_("cannot fold public revisions"))
1b1c8c0ab20e evolve: factor out sanity checks for folds Siddharth Agarwal <sid0@fb.com> parents: 1680 diff changeset	2916 heads = repo.revs('heads(%ld)', revs)
1b1c8c0ab20e evolve: factor out sanity checks for folds Siddharth Agarwal <sid0@fb.com> parents: 1680 diff changeset	2917 if len(heads) > 1:
1b1c8c0ab20e evolve: factor out sanity checks for folds Siddharth Agarwal <sid0@fb.com> parents: 1680 diff changeset	2918 raise error.Abort(_("cannot fold non-linear revisions "
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	2919 "(multiple heads given)"))
1681 1b1c8c0ab20e evolve: factor out sanity checks for folds Siddharth Agarwal <sid0@fb.com> parents: 1680 diff changeset	2920 head = repo[heads.first()]
1682 40d7b0c4abb1 evolve: factor out check for creating unstable commits Siddharth Agarwal <sid0@fb.com> parents: 1681 diff changeset	2921 if _disallowednewunstable(repo, revs):
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	2922 msg = _("cannot fold chain not ending with a head or with branching")
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	2923 hint = _("new unstable changesets are not allowed")
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	2924 raise error.Abort(msg, hint=hint)
1681 1b1c8c0ab20e evolve: factor out sanity checks for folds Siddharth Agarwal <sid0@fb.com> parents: 1680 diff changeset	2925 return root, head
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	2926
1682 40d7b0c4abb1 evolve: factor out check for creating unstable commits Siddharth Agarwal <sid0@fb.com> parents: 1681 diff changeset	2927 def _disallowednewunstable(repo, revs):
40d7b0c4abb1 evolve: factor out check for creating unstable commits Siddharth Agarwal <sid0@fb.com> parents: 1681 diff changeset	2928 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
40d7b0c4abb1 evolve: factor out check for creating unstable commits Siddharth Agarwal <sid0@fb.com> parents: 1681 diff changeset	2929 if allowunstable:
40d7b0c4abb1 evolve: factor out check for creating unstable commits Siddharth Agarwal <sid0@fb.com> parents: 1681 diff changeset	2930 return revset.baseset()
40d7b0c4abb1 evolve: factor out check for creating unstable commits Siddharth Agarwal <sid0@fb.com> parents: 1681 diff changeset	2931 return repo.revs("(%ld::) - %ld", revs, revs)
40d7b0c4abb1 evolve: factor out check for creating unstable commits Siddharth Agarwal <sid0@fb.com> parents: 1681 diff changeset	2932
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2933 @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	2934 def graftwrapper(orig, ui, repo, revs, *kwargs):
419 03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 410 diff changeset	2935 kwargs = dict(kwargs)
03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 410 diff changeset	2936 revs = list(revs) + kwargs.get('rev', [])
03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 410 diff changeset	2937 kwargs['rev'] = []
417 a1fb18ad29a1 evolve: avoid duplication in graft wrapper Patrick Mezard <patrick@mezard.eu> parents: 416 diff changeset	2938 obsoleted = kwargs.setdefault('obsolete', [])
419 03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 410 diff changeset	2939
1256 f8cb01637e75 graft: avoid potential deadlock Pierre-Yves David <pierre-yves.david@fb.com> parents: 1255 diff changeset	2940 wlock = lock = None
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	2941 try:
1256 f8cb01637e75 graft: avoid potential deadlock Pierre-Yves David <pierre-yves.david@fb.com> parents: 1255 diff changeset	2942 wlock = repo.wlock()
f8cb01637e75 graft: avoid potential deadlock Pierre-Yves David <pierre-yves.david@fb.com> parents: 1255 diff changeset	2943 lock = repo.lock()
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	2944 if kwargs.get('old_obsolete'):
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 417 diff changeset	2945 if kwargs.get('continue'):
2051 74934195747b evolve: switch away from deprecated repo.opener Martin von Zweigbergk <martinvonz@google.com> parents: 2049 diff changeset	2946 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	2947 else:
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	2948 obsoleted.extend(revs)
151 e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	2949 # 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	2950 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	2951 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	2952
743 af74a5cdf96b conform to the Mercurial custom of lowercase messages Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 742 diff changeset	2953 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	2954 'obsoleting (for now).'))
e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	2955
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	2956 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	2957 finally:
1256 f8cb01637e75 graft: avoid potential deadlock Pierre-Yves David <pierre-yves.david@fb.com> parents: 1255 diff changeset	2958 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	2959
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2960 @eh.extsetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2961 def oldevolveextsetup(ui):
1631 7463f5880ce9 prune: remove the kill alias Pierre-Yves David <pierre-yves.david@fb.com> parents: 1630 diff changeset	2962 for cmd in ['prune', 'uncommit', 'touch', 'fold']:
1226 901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	2963 try:
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	2964 entry = extensions.wrapcommand(cmdtable, cmd,
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	2965 warnobserrors)
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	2966 except error.UnknownCommand:
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	2967 # Commands may be disabled
901d2f4b21a9 config: allow disabling commands Durham Goode <durham@fb.com> parents: 1221 diff changeset	2968 continue
356 56d4c6207ef9 Move obserror warning into the obsolete extension. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 355 diff changeset	2969
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2970 entry = cmdutil.findcmd('commit', commands.table)[1]
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	2971 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	2972 _("make commit obsolete this revision (DEPRECATED)")))
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	2973 entry = cmdutil.findcmd('graft', commands.table)[1]
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	2974 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	2975 _("make graft obsoletes this revision (DEPRECATED)")))
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	2976 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	2977 _("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	2978
1302 ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2979 @eh.wrapfunction(obsolete, '_checkinvalidmarkers')
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2980 def _checkinvalidmarkers(orig, markers):
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2981 """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	2982
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2983 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	2984 subtle handling.
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2985 """
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2986 if 'debugobsconvert' in sys.argv:
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2987 return
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2988 for mark in markers:
ebcf23fe3032 evolve: stop conditional wrapping of _checkinvalidmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 1301 diff changeset	2989 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	2990 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	2991 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	2992 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	2993
2043 c64300906a32 exthelper: move command declaration into the exthelper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2041 diff changeset	2994 @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	2995 'debugobsconvert',
2053 f3765c4a352a exchange: rename the module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2051 diff changeset	2996 [('', '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	2997 '')
04bd66779a1f obsup: hack extension to make in-place upgrading of obsolete markers easy Augie Fackler <raf@durin42.com> parents: 1157 diff changeset	2998 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	2999 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	3000 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	3001 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	3002 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	3003 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	3004 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	3005 known = set()
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	3006 markers = []
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	3007 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	3008 # 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	3009 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	3010 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	3011 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	3012 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	3013 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	3014 continue
723f5b505c48 debugobsconvert: take the lock when writing the obsstore file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2745 diff changeset	3015 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	3016 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	3017 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	3018 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	3019 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	3020 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	3021 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	3022
864 401da1b38cca discovery: implement a discovery process and use it for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 863 diff changeset	3023
1827 15ec53d46f44 compat: drop handling of ancestral 'helploader' caller Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1826 diff changeset	3024 def _helploader(ui):
1414 4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	3025 return help.gettext(evolutionhelptext)
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	3026
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	3027 @eh.uisetup
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	3028 def _setuphelp(ui):
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	3029 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	3030 if entry[0] == "evolution":
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	3031 break
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	3032 else:
4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	3033 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	3034 _helploader))
1414 4198e2fad6ba evolve: add an help topic about evolution Pierre-Yves David <pierre-yves.david@fb.com> parents: 1413 diff changeset	3035 help.helptable.sort()
1567 536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3036
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3037 def _relocatecommit(repo, orig, commitmsg):
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3038 if commitmsg is None:
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3039 commitmsg = orig.description()
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3040 extra = dict(orig.extra())
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3041 if 'branch' in extra:
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3042 del extra['branch']
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3043 extra['rebase_source'] = orig.hex()
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3044
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3045 backup = repo.ui.backupconfig('phases', 'new-commit')
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3046 try:
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3047 targetphase = max(orig.phase(), phases.draft)
1636 13f830540a14 config: report evolve as origin for config timeless@gmail.com parents: 1635 diff changeset	3048 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	3049 # Commit might fail if unresolved files exist
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3050 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	3051 date=orig.date(), extra=extra)
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3052 finally:
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3053 repo.ui.restoreconfig(backup)
536fdfa3c48b evolve: extract logic to new method _relocatecommit Shusen LIU <liushusen@fb.com> parents: 1566 diff changeset	3054 return nodenew
1568 52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3055
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3056 def _finalizerelocate(repo, orig, dest, nodenew, tr):
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3057 destbookmarks = repo.nodebookmarks(dest.node())
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3058 nodesrc = orig.node()
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3059 destphase = repo[nodesrc].phase()
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3060 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	3061 bmchanges = []
4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	3062
1568 52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3063 if nodenew is not None:
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3064 phases.retractboundary(repo, tr, destphase, [nodenew])
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3065 obsolete.createmarkers(repo, [(repo[nodesrc], (repo[nodenew],))])
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3066 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	3067 bmchanges.append((book, nodenew))
1568 52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3068 else:
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3069 obsolete.createmarkers(repo, [(repo[nodesrc], ())])
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3070 # Behave like rebase, move bookmarks to dest
52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3071 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	3072 bmchanges.append((book, dest.node()))
1568 52c276d2ddb2 evolve: extract logic to new method _finalizerelocate Shusen LIU <liushusen@fb.com> parents: 1567 diff changeset	3073 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	3074 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	3075 if bmchanges:
4457aa1d81aa compat: add a compatibility layer for bookmark move Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2748 diff changeset	3076 compat.bookmarkapplychanges(repo, tr, bmchanges)
1592 f157ef7b1741 evolve: extract logic to new method _evolvemerge Shusen LIU <liushusen@fb.com> parents: 1589 diff changeset	3077
1597 7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3078 evolvestateversion = 0
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3079
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3080 @eh.uisetup
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3081 def setupevolveunfinished(ui):
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3082 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	3083 _("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	3084 cmdutil.unfinishedstates.append(data)
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3085
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3086 @eh.wrapfunction(hg, 'clean')
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3087 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	3088 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	3089 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	3090 return ret
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3091
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3092 def _evolvestatewrite(repo, state):
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3093 # [version]
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3094 # [type][length][content]
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3095 #
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3096 # `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	3097 # `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	3098 # `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	3099 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	3100 try:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3101 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	3102 current = state['current']
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3103 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	3104 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	3105 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	3106 finally:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3107 f.close()
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3108
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3109 def _evolvestateread(repo):
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3110 try:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3111 f = repo.vfs('evolvestate')
1677 6103f6ac8110 py3: change except from two comma to as notation timeless@gmail.com parents: 1676 diff changeset	3112 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	3113 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	3114 raise
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3115 return None
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3116 try:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3117 versionblob = f.read(4)
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3118 if len(versionblob) < 4:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3119 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	3120 % len(versionblob))
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3121 return None
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3122 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	3123 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	3124 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	3125 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	3126 records = []
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3127 data = f.read()
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3128 off = 0
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3129 end = len(data)
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3130 while off < end:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3131 rtype = data[off]
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3132 off += 1
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3133 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	3134 off += 4
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3135 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	3136 off += length
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3137 if rtype == 't':
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3138 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	3139 records.append((rtype, record))
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3140 state = {}
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3141 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	3142 if rtype == 'C':
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3143 state['current'] = rdata
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3144 elif rtype.lower():
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3145 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	3146 else:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3147 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	3148 % 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	3149 return state
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3150 finally:
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3151 f.close()
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3152
7876ed4fceb7 evolve: write our own custom evolvestate file Pierre-Yves David <pierre-yves.david@fb.com> parents: 1594 diff changeset	3153 def _evolvestatedelete(repo):
2070 9105c3c54045 cleanup: stop using 'repo.join' methods Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2064 diff changeset	3154 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	3155
1592 f157ef7b1741 evolve: extract logic to new method _evolvemerge Shusen LIU <liushusen@fb.com> parents: 1589 diff changeset	3156 def _evolvemerge(repo, orig, dest, pctx, keepbranch):
f157ef7b1741 evolve: extract logic to new method _evolvemerge Shusen LIU <liushusen@fb.com> parents: 1589 diff changeset	3157 """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	3158 return the same tuple as merge.graft"""
f157ef7b1741 evolve: extract logic to new method _evolvemerge Shusen LIU <liushusen@fb.com> parents: 1589 diff changeset	3159 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	3160 merge.update(repo,
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	3161 dest,
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	3162 branchmerge=False,
0195dc7bdfa4 compat: drop compatibility layer around update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1830 diff changeset	3163 force=True)
1835 93d4661a6ee7 compat: drop bookmark compatibility layer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1834 diff changeset	3164 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	3165 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	3166 bookmarksmod.deactivate(repo)
1592 f157ef7b1741 evolve: extract logic to new method _evolvemerge Shusen LIU <liushusen@fb.com> parents: 1589 diff changeset	3167 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	3168 repo.dirstate.setbranch(orig.branch())
1627 a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	3169 if util.safehasattr(repo, 'currenttopic'):
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	3170 # uurrgs
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	3171 # there no other topic setter yet
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	3172 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	3173 repo.vfs.unlink('topic')
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	3174 else:
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	3175 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	3176 f.write(orig.topic())
1592 f157ef7b1741 evolve: extract logic to new method _evolvemerge Shusen LIU <liushusen@fb.com> parents: 1589 diff changeset	3177
1826 19df96c0d670 compat: drop hack around a 'graft' signature change Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1825 diff changeset	3178 return merge.graft(repo, orig, pctx, ['local', 'graft'], True)

Mercurial > evolve

annotate hgext3rd/evolve/__init__.py @ 2755:f690d51dfe5e

annotate hgext3rd/evolve/init.py @ 2755:f690d51dfe5e