mercurial-scm/evolve: hgext/evolve.py annotate

annotate hgext/evolve.py @ 934:f13facb01ac5 stable

fold: add squash as a possible alias In order to respect the habituation of the majority of DVCS users and to make this feature more easily discoverable, the very common "squash" terminology should be added as a synonym to "fold". Since git does not have a squash command, this should be safe.

author	Jordi Guti?rrez Hermoso <jordigh@octave.org>
date	Thu, 10 Apr 2014 16:02:02 -0400
parents	e5baeb8fefec
children	43cceb37324c 561b3cdb4453

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.
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	8
893 12ed6dfa8eea evolve: downcase first word in module doc Olle Lundberg <geek@nerd.sh> parents: 892 diff changeset	9 '''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	10
540 8c5da9e75ae0 evolve: fixing syntax/grammar Patrick Mezard <patrick@mezard.eu> parents: 539 diff changeset	11 This extension provides several commands to mutate history and deal with
8c5da9e75ae0 evolve: fixing syntax/grammar Patrick Mezard <patrick@mezard.eu> parents: 539 diff changeset	12 issues it may raise.
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	13
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	14 It also:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	15
540 8c5da9e75ae0 evolve: fixing syntax/grammar Patrick Mezard <patrick@mezard.eu> parents: 539 diff changeset	16 - enables the "Changeset Obsolescence" feature of mercurial,
8c5da9e75ae0 evolve: fixing syntax/grammar Patrick Mezard <patrick@mezard.eu> parents: 539 diff changeset	17 - alters core commands and extensions that rewrite history to use
8c5da9e75ae0 evolve: fixing syntax/grammar Patrick Mezard <patrick@mezard.eu> parents: 539 diff changeset	18 this feature,
8c5da9e75ae0 evolve: fixing syntax/grammar Patrick Mezard <patrick@mezard.eu> parents: 539 diff changeset	19 - improves some aspect of the early implementation in 2.3
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	20 '''
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	21
912 0c1907a65b9f test: update testing statement Pierre-Yves David <pierre-yves.david@fb.com> parents: 911 diff changeset	22 testedwith = '2.7 2.7.1 2.7.2 2.8 2.8.1 2.8.2 2.9 2.9.1 2.9.2 3.0'
584 af3b0d696e7f evolve: add tested with info Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 577 diff changeset	23 buglink = 'https://bitbucket.org/marmoute/mutable-history/issues'
af3b0d696e7f evolve: add tested with info Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 577 diff changeset	24
675 af9cc1e861a4 add an explicite warning when repo contains invalid obsolescence markers Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 674 diff changeset	25 import sys
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	26 import random
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	27
670 97ce1f801309 evolve: drop unused import Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 663 diff changeset	28 import mercurial
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	29 from mercurial import util
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	30
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	31 try:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	32 from mercurial import obsolete
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	33 if not obsolete._enabled:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	34 obsolete._enabled = True
617 469befc27b26 detect incompatibility with future mercurial 2.5 Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 616 diff changeset	35 from mercurial import bookmarks
469befc27b26 detect incompatibility with future mercurial 2.5 Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 616 diff changeset	36 bookmarks.bmstore
591 012e48e80840 evolve: require Mercurial 2.4 to work Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 590 diff changeset	37 except (ImportError, AttributeError):
647 a2b805bacdc0 evolve: fix version message Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 645 diff changeset	38 raise util.Abort('Your Mercurial is too old for this version of Evolve',
618 c39afce52e31 merge Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 612 617 diff changeset	39 hint='requires version >> 2.4.x')
617 469befc27b26 detect incompatibility with future mercurial 2.5 Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 616 diff changeset	40
585 f013ca072bd9 evolve: detect and abort if 2.4 is detected Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 584 diff changeset	41
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	42
490 8096833e9226 sort import Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 485 diff changeset	43 from mercurial import bookmarks
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	44 from mercurial import cmdutil
490 8096833e9226 sort import Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 485 diff changeset	45 from mercurial import commands
8096833e9226 sort import Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 485 diff changeset	46 from mercurial import context
8096833e9226 sort import Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 485 diff changeset	47 from mercurial import copies
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	48 from mercurial import error
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	49 from mercurial import extensions
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	50 from mercurial import hg
514 ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	51 from mercurial import lock as lockmod
490 8096833e9226 sort import Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 485 diff changeset	52 from mercurial import merge
8096833e9226 sort import Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 485 diff changeset	53 from mercurial import node
113 3bdabdbb4140 adapt evolution to phase in core. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 108 diff changeset	54 from mercurial import phases
930 cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	55 from mercurial import patch
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	56 from mercurial import revset
490 8096833e9226 sort import Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 485 diff changeset	57 from mercurial import scmutil
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	58 from mercurial import templatekw
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	59 from mercurial.i18n import _
455 f46a41006136 obsolete: simplify rebase wrapping code and change relation creation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	60 from mercurial.commands import walkopts, commitopts, commitopts2
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	61 from mercurial.node import nullid
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	62
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	63
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	64
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	65 # This extension contains the following code
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	66 #
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	67 # - Extension Helper code
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	68 # - Obsolescence cache
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	69 # - ...
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	70 # - Older format compat
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	71
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	72
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	73
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	74 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	75 ### Extension helper ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	76 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	77
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	78 class exthelper(object):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	79 """Helper for modular extension setup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	80
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	81 A single helper should be instanciated for each extension. Helper
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	82 methods are then used as decorator for various purpose.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	83
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	84 All decorators return the original function and may be chained.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	85 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	86
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	87 def __init__(self):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	88 self._uicallables = []
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	89 self._extcallables = []
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	90 self._repocallables = []
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	91 self._revsetsymbols = []
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	92 self._templatekws = []
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	93 self._commandwrappers = []
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	94 self._extcommandwrappers = []
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	95 self._functionwrappers = []
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	96 self._duckpunchers = []
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	97
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	98 def final_uisetup(self, ui):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	99 """Method to be used as the extension uisetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	100
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	101 The following operations belong here:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	102
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	103 - Changes to ui.__class__ . The ui object that will be used to run the
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	104 command has not yet been created. Changes made here will affect ui
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	105 objects created after this, and in particular the ui that will be
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	106 passed to runcommand
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	107 - Command wraps (extensions.wrapcommand)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	108 - Changes that need to be visible to other extensions: because
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	109 initialization occurs in phases (all extensions run uisetup, then all
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	110 run extsetup), a change made here will be visible to other extensions
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	111 during extsetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	112 - Monkeypatch or wrap function (extensions.wrapfunction) of dispatch
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	113 module members
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	114 - Setup of pre-* and post-* hooks
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	115 - pushkey setup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	116 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	117 for cont, funcname, func in self._duckpunchers:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	118 setattr(cont, funcname, func)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	119 for command, wrapper in self._commandwrappers:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	120 extensions.wrapcommand(commands.table, command, wrapper)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	121 for cont, funcname, wrapper in self._functionwrappers:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	122 extensions.wrapfunction(cont, funcname, wrapper)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	123 for c in self._uicallables:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	124 c(ui)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	125
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	126 def final_extsetup(self, ui):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	127 """Method to be used as a the extension extsetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	128
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	129 The following operations belong here:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	130
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	131 - Changes depending on the status of other extensions. (if
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	132 extensions.find('mq'))
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	133 - Add a global option to all commands
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	134 - Register revset functions
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	135 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	136 knownexts = {}
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	137 for name, symbol in self._revsetsymbols:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	138 revset.symbols[name] = symbol
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	139 for name, kw in self._templatekws:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	140 templatekw.keywords[name] = kw
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	141 for ext, command, wrapper in self._extcommandwrappers:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	142 if ext not in knownexts:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	143 e = extensions.find(ext)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	144 if e is None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	145 raise util.Abort('extension %s not found' % ext)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	146 knownexts[ext] = e.cmdtable
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	147 extensions.wrapcommand(knownexts[ext], commands, wrapper)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	148 for c in self._extcallables:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	149 c(ui)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	150
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	151 def final_reposetup(self, ui, repo):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	152 """Method to be used as a the extension reposetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	153
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	154 The following operations belong here:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	155
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	156 - All hooks but pre-* and post-*
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	157 - Modify configuration variables
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	158 - Changes to repo.__class__, repo.dirstate.__class__
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	159 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	160 for c in self._repocallables:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	161 c(ui, repo)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	162
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	163 def uisetup(self, call):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	164 """Decorated function will be executed during uisetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	165
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	166 example::
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	167
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	168 @eh.uisetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	169 def setupbabar(ui):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	170 print 'this is uisetup!'
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	171 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	172 self._uicallables.append(call)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	173 return call
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	174
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	175 def extsetup(self, call):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	176 """Decorated function will be executed during extsetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	177
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	178 example::
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	179
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	180 @eh.extsetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	181 def setupcelestine(ui):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	182 print 'this is extsetup!'
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	183 """
672 f7834b360f8f evolve: fix extsetup extension helper Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 671 diff changeset	184 self._extcallables.append(call)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	185 return call
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	186
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	187 def reposetup(self, call):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	188 """Decorated function will be executed during reposetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	189
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	190 example::
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	191
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	192 @eh.reposetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	193 def setupzephir(ui, repo):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	194 print 'this is reposetup!'
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	195 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	196 self._repocallables.append(call)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	197 return call
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	198
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	199 def revset(self, symbolname):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	200 """Decorated function is a revset symbol
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	201
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	202 The name of the symbol must be given as the decorator argument.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	203 The symbol is added during `extsetup`.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	204
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	205 example::
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	206
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	207 @eh.revset('hidden')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	208 def revsetbabar(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	209 args = revset.getargs(x, 0, 0, 'babar accept no argument')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	210 return [r for r in subset if 'babar' in repo[r].description()]
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	211 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	212 def dec(symbol):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	213 self._revsetsymbols.append((symbolname, symbol))
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	214 return symbol
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	215 return dec
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	216
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	217
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	218 def templatekw(self, keywordname):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	219 """Decorated function is a revset keyword
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	220
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	221 The name of the keyword must be given as the decorator argument.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	222 The symbol is added during `extsetup`.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	223
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	224 example::
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	225
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	226 @eh.templatekw('babar')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	227 def kwbabar(ctx):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	228 return 'babar'
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	229 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	230 def dec(keyword):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	231 self._templatekws.append((keywordname, keyword))
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	232 return keyword
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	233 return dec
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	234
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	235 def wrapcommand(self, command, extension=None):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	236 """Decorated function is a command wrapper
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	237
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	238 The name of the command must be given as the decorator argument.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	239 The wrapping is installed during `uisetup`.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	240
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	241 If the second option `extension` argument is provided, the wrapping
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	242 will be applied in the extension commandtable. This argument must be a
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	243 string that will be searched using `extension.find` if not found and
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	244 Abort error is raised. If the wrapping applies to an extension, it is
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	245 installed during `extsetup`
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	246
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	247 example::
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	248
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	249 @eh.wrapcommand('summary')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	250 def wrapsummary(orig, ui, repo, args, *kwargs):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	251 ui.note('Barry!')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	252 return orig(ui, repo, args, *kwargs)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	253
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	254 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	255 def dec(wrapper):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	256 if extension is None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	257 self._commandwrappers.append((command, wrapper))
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	258 else:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	259 self._extcommandwrappers.append((extension, command, wrapper))
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	260 return wrapper
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	261 return dec
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	262
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	263 def wrapfunction(self, container, funcname):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	264 """Decorated function is a function wrapper
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	265
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	266 This function takes two arguments, the container and the name of the
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	267 function to wrap. The wrapping is performed during `uisetup`.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	268 (there is no extension support)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	269
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	270 example::
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	271
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	272 @eh.function(discovery, 'checkheads')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	273 def wrapfunction(orig, args, *kwargs):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	274 ui.note('His head smashed in and his heart cut out')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	275 return orig(args, *kwargs)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	276 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	277 def dec(wrapper):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	278 self._functionwrappers.append((container, funcname, wrapper))
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	279 return wrapper
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	280 return dec
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	281
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	282 def addattr(self, container, funcname):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	283 """Decorated function is to be added to the container
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	284
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	285 This function takes two arguments, the container and the name of the
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	286 function to wrap. The wrapping is performed during `uisetup`.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	287
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	288 example::
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	289
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	290 @eh.function(context.changectx, 'babar')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	291 def babar(ctx):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	292 return 'babar' in ctx.description
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	293 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	294 def dec(func):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	295 self._duckpunchers.append((container, funcname, func))
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	296 return func
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	297 return dec
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	298
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	299 eh = exthelper()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	300 uisetup = eh.final_uisetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	301 extsetup = eh.final_extsetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	302 reposetup = eh.final_reposetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	303
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	304 #####################################################################
577 2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	305 ### Critical fix ###
2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	306 #####################################################################
2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	307
2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	308 @eh.wrapfunction(mercurial.obsolete, '_readmarkers')
2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	309 def safereadmarkers(orig, data):
2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	310 """safe maker wrapper to remove nullid succesors
2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	311
2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	312 Nullid successors was created by older version of evolve.
2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	313 """
675 af9cc1e861a4 add an explicite warning when repo contains invalid obsolescence markers Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 674 diff changeset	314 nb = 0
577 2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	315 for marker in orig(data):
2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	316 if nullid in marker[1]:
2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	317 marker = (marker[0],
2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	318 tuple(s for s in marker[1] if s != nullid),
2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	319 marker[2],
2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	320 marker[3])
675 af9cc1e861a4 add an explicite warning when repo contains invalid obsolescence markers Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 674 diff changeset	321 nb += 1
577 2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	322 yield marker
675 af9cc1e861a4 add an explicite warning when repo contains invalid obsolescence markers Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 674 diff changeset	323 if nb:
af9cc1e861a4 add an explicite warning when repo contains invalid obsolescence markers Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 674 diff changeset	324 e = sys.stderr
af9cc1e861a4 add an explicite warning when repo contains invalid obsolescence markers Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 674 diff changeset	325 print >> e, 'repo contains %i invalid obsolescence markers' % nb
577 2cd2ee20d9fa evolve: filter nullid successors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 576 diff changeset	326
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	327 getrevs = obsolete.getrevs
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	328
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	329 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	330 ### Additional Utilities ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	331 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	332
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	333 # 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	334
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	335 # - Function to create markers
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	336 # - 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	337 # - "troubles" method on changectx
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	338 # - function to travel throught the obsolescence graph
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	339 # - function to find useful changeset to stabilize
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	340
579 f6063ef211fd evolve: drop code now in core Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 577 diff changeset	341 createmarkers = obsolete.createmarkers
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	342
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	343
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	344 ### Useful alias
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	345
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	346 @eh.uisetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	347 def _installalias(ui):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	348 if ui.config('alias', 'pstatus', None) is None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	349 ui.setconfig('alias', 'pstatus', 'status --rev .^')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	350 if ui.config('alias', 'pdiff', None) is None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	351 ui.setconfig('alias', 'pdiff', 'diff --rev .^')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	352 if ui.config('alias', 'olog', None) is None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	353 ui.setconfig('alias', 'olog', "log -r 'precursors(.)' --hidden")
497 43e1b2cab789 evolve: add the odiff alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	354 if ui.config('alias', 'odiff', None) is None:
625 e291e5271694 prepare for Full scale filtering !!! Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 622 diff changeset	355 ui.setconfig('alias', 'odiff', "diff --hidden --rev 'limit(precursors(.),1)' --rev .")
696 121e2d265e85 alias: add a grab alias Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 695 diff changeset	356 if ui.config('alias', 'grab', None) is None:
752 bfdfdf731f8a grab: update the alias for 2.8 compatibility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 751 diff changeset	357 ui.setconfig('alias', 'grab', "! $HG rebase --dest . --rev $@ && $HG up tip")
696 121e2d265e85 alias: add a grab alias Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 695 diff changeset	358
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	359
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	360 ### Troubled revset symbol
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	361
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	362 @eh.revset('troubled')
594 7f89b31fcb26 merge bumped rename Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 592 593 diff changeset	363 def revsettroubled(repo, subset, x):
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	364 """``troubled()``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	365 Changesets with troubles.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	366 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	367 _ = revset.getargs(x, 0, 0, 'troubled takes no arguments')
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	368 return repo.revs('%ld and (unstable() + bumped() + divergent())',
511 ddeb71df916d evolve: localrepo.revs() already returns a list Patrick Mezard <patrick@mezard.eu> parents: 510 diff changeset	369 subset)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	370
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	371
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	372 ### Obsolescence graph
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	373
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	374 # 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	375
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	376 def _precursors(repo, s):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	377 """Precursor of a changeset"""
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	378 cs = set()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	379 nm = repo.changelog.nodemap
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	380 markerbysubj = repo.obsstore.precursors
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	381 for r in s:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	382 for p in markerbysubj.get(repo[r].node(), ()):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	383 pr = nm.get(p[0])
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	384 if pr is not None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	385 cs.add(pr)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	386 return cs
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	387
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	388 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	389 """transitive precursors of a subset"""
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	390 toproceed = [repo[r].node() for r in s]
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	391 seen = set()
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	392 allsubjects = repo.obsstore.precursors
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	393 while toproceed:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	394 nc = toproceed.pop()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	395 for mark in allsubjects.get(nc, ()):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	396 np = mark[0]
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	397 if np not in seen:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	398 seen.add(np)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	399 toproceed.append(np)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	400 nm = repo.changelog.nodemap
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	401 cs = set()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	402 for p in seen:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	403 pr = nm.get(p)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	404 if pr is not None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	405 cs.add(pr)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	406 return cs
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	407
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	408 def _successors(repo, s):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	409 """Successors of a changeset"""
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	410 cs = set()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	411 nm = repo.changelog.nodemap
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	412 markerbyobj = repo.obsstore.successors
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	413 for r in s:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	414 for p in markerbyobj.get(repo[r].node(), ()):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	415 for sub in p[1]:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	416 sr = nm.get(sub)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	417 if sr is not None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	418 cs.add(sr)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	419 return cs
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	420
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	421 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	422 """transitive successors of a subset
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	423
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	424 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	425 marker. """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	426 toproceed = [repo[r].node() for r in s]
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	427 seen = set()
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	428 allobjects = repo.obsstore.successors
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	429 while toproceed:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	430 nc = toproceed.pop()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	431 for mark in allobjects.get(nc, ()):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	432 if mark[2] & haltonflags:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	433 continue
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	434 for sub in mark[1]:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	435 if sub == nullid:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	436 continue # should not be here!
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	437 if sub not in seen:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	438 seen.add(sub)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	439 toproceed.append(sub)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	440 nm = repo.changelog.nodemap
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	441 cs = set()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	442 for s in seen:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	443 sr = nm.get(s)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	444 if sr is not None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	445 cs.add(sr)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	446 return cs
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	447
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	448
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	449
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	450
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	451 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	452 ### Extending revset and template ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	453 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	454
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	455 # 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	456 # they are subject to changes
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	457
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	458
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	459 ### 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	460 @eh.revset('suspended')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	461 def revsetsuspended(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	462 """``suspended()``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	463 Obsolete changesets with non-obsolete descendants.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	464 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	465 args = revset.getargs(x, 0, 0, 'suspended takes no arguments')
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	466 suspended = getrevs(repo, 'suspended')
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	467 return [r for r in subset if r in suspended]
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	468
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	469
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	470 @eh.revset('precursors')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	471 def revsetprecursors(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	472 """``precursors(set)``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	473 Immediate precursors of changesets in set.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	474 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	475 s = revset.getset(repo, range(len(repo)), x)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	476 cs = _precursors(repo, s)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	477 return [r for r in subset if r in cs]
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	478
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	479
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	480 @eh.revset('allprecursors')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	481 def revsetallprecursors(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	482 """``allprecursors(set)``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	483 Transitive precursors of changesets in set.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	484 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	485 s = revset.getset(repo, range(len(repo)), x)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	486 cs = _allprecursors(repo, s)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	487 return [r for r in subset if r in cs]
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	488
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	489
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	490 @eh.revset('successors')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	491 def revsetsuccessors(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	492 """``successors(set)``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	493 Immediate successors of changesets in set.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	494 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	495 s = revset.getset(repo, range(len(repo)), x)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	496 cs = _successors(repo, s)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	497 return [r for r in subset if r in cs]
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	498
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	499 @eh.revset('allsuccessors')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	500 def revsetallsuccessors(repo, subset, x):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	501 """``allsuccessors(set)``
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	502 Transitive successors of changesets in set.
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 s = revset.getset(repo, range(len(repo)), x)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	505 cs = _allsuccessors(repo, s)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	506 return [r for r in subset if r in cs]
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	507
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	508 ### template keywords
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	509 # XXX it does not handle troubles well :-/
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	510
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	511 @eh.templatekw('obsolete')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	512 def obsoletekw(repo, ctx, templ, **args):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	513 """:obsolete: String. The obsolescence level of the node, could be
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	514 ``stable``, ``unstable``, ``suspended`` or ``extinct``.
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	515 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	516 rev = ctx.rev()
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	517 if ctx.obsolete():
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	518 if ctx.extinct():
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	519 return 'extinct'
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	520 else:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	521 return 'suspended'
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	522 elif ctx.unstable():
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	523 return 'unstable'
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	524 return 'stable'
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	525
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	526 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	527 ### Various trouble warning ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	528 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	529
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	530 # 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	531
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	532 @eh.wrapcommand("update")
745 99e51aff724b add obsolete parents wrapper to the 'parents' command Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 743 diff changeset	533 @eh.wrapcommand("parents")
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	534 @eh.wrapcommand("pull")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	535 def wrapmayobsoletewc(origfn, ui, repo, args, *opts):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	536 """Warn that the working directory parent is an obsolete changeset"""
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	537 res = origfn(ui, repo, args, *opts)
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	538 if repo['.'].obsolete():
743 af74a5cdf96b conform to the Mercurial custom of lowercase messages Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 742 diff changeset	539 ui.warn(_('working directory parent is obsolete!\n'))
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	540 return res
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	541
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	542 # XXX this could wrap transaction code
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	543 # 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	544 @eh.wrapcommand("commit")
763 966e2659e989 import: warn about new unstable changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 762 diff changeset	545 @eh.wrapcommand("import")
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	546 @eh.wrapcommand("push")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	547 @eh.wrapcommand("pull")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	548 @eh.wrapcommand("graft")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	549 @eh.wrapcommand("phase")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	550 @eh.wrapcommand("unbundle")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	551 def warnobserrors(orig, ui, repo, args, *kwargs):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	552 """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	553 # 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	554 # 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	555 filtered = repo.changelog.filteredrevs
2a2b8c95bb43 evolve: remove revset calls in warnobserror Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 657 diff changeset	556 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	557 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	558 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	559 ret = orig(ui, repo, args, *kwargs)
552 f7e54d4a3b90 warning: work around phase limitation when computing warnings Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 551 diff changeset	560 # workaround phase stupidity
649 d318fbb1cd67 evolve: stop working around phase limitation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 647 diff changeset	561 #phases._filterunknown(ui, repo.changelog, repo._phasecache.phaseroots)
658 2a2b8c95bb43 evolve: remove revset calls in warnobserror Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 657 diff changeset	562 filtered = repo.changelog.filteredrevs
2a2b8c95bb43 evolve: remove revset calls in warnobserror Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 657 diff changeset	563 newunstables = len(set(getrevs(repo, 'unstable')) - filtered) - priorunstables
2a2b8c95bb43 evolve: remove revset calls in warnobserror Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 657 diff changeset	564 newbumpeds = len(set(getrevs(repo, 'bumped')) - filtered) - priorbumpeds
2a2b8c95bb43 evolve: remove revset calls in warnobserror Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 657 diff changeset	565 newdivergents = 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	566 if newunstables > 0:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	567 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	568 if newbumpeds > 0:
26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	569 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	570 if newdivergents > 0:
f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	571 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	572 return ret
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	573
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	574 @eh.reposetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	575 def _repostabilizesetup(ui, repo):
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	576 """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	577 """
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	578 if not repo.local():
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	579 return
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	580
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	581 class evolvingrepo(repo.__class__):
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	582 def push(self, remote, args, *opts):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	583 """wrapper around pull that pull obsolete relation"""
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	584 try:
756 64c6bdfd0518 evolve: use super for calling parent class method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 752 diff changeset	585 result = super(evolvingrepo, self).push(remote, args, *opts)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	586 except util.Abort, ex:
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	587 hint = _("use 'hg evolve' to get a stable history "
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	588 "or --force to ignore warnings")
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	589 if (len(ex.args) >= 1
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	590 and ex.args[0].startswith('push includes ')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	591 and ex.hint is None):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	592 ex.hint = hint
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	593 raise
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	594 return result
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	595 repo.__class__ = evolvingrepo
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	596
788 e973dd5bf583 evolve: register a summary hook instead of wrapping the summary command Simon Heimberg <simohe@besonet.ch> parents: 776 diff changeset	597 def summaryhook(ui, repo):
513 4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	598 def write(fmt, count):
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	599 s = fmt % count
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	600 if count:
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	601 ui.write(s)
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	602 else:
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	603 ui.note(s)
4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	604
590 02cadd3dc9f4 evolve: adapt to 2.4 code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 589 diff changeset	605 nbunstable = len(getrevs(repo, 'unstable'))
594 7f89b31fcb26 merge bumped rename Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 592 593 diff changeset	606 nbbumped = len(getrevs(repo, 'bumped'))
626 896463193675 merge with fix in 2.3 Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 621 623 diff changeset	607 nbdivergent = len(getrevs(repo, 'divergent'))
513 4602104b190d evolve: factor out copy/paste in obssummary() Patrick Mezard <patrick@mezard.eu> parents: 512 diff changeset	608 write('unstable: %i changesets\n', nbunstable)
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	609 write('bumped: %i changesets\n', nbbumped)
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	610 write('divergent: %i changesets\n', nbdivergent)
788 e973dd5bf583 evolve: register a summary hook instead of wrapping the summary command Simon Heimberg <simohe@besonet.ch> parents: 776 diff changeset	611
e973dd5bf583 evolve: register a summary hook instead of wrapping the summary command Simon Heimberg <simohe@besonet.ch> parents: 776 diff changeset	612 @eh.extsetup
e973dd5bf583 evolve: register a summary hook instead of wrapping the summary command Simon Heimberg <simohe@besonet.ch> parents: 776 diff changeset	613 def obssummarysetup(ui):
e973dd5bf583 evolve: register a summary hook instead of wrapping the summary command Simon Heimberg <simohe@besonet.ch> parents: 776 diff changeset	614 cmdutil.summaryhooks.add('evolve', summaryhook)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	615
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	616
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	617 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	618 ### Core Other extension compat ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	619 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	620
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	621
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	622 @eh.extsetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	623 def _rebasewrapping(ui):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	624 # warning about more obsolete
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	625 try:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	626 rebase = extensions.find('rebase')
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	627 if rebase:
572 dc107acd0bd2 adapt to core rebase support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 571 diff changeset	628 extensions.wrapcommand(rebase.cmdtable, 'rebase', warnobserrors)
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	629 except KeyError:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	630 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	631 try:
718262019c6f evolve: warn for troubles created by histedit too. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 677 diff changeset	632 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	633 if histedit:
718262019c6f evolve: warn for troubles created by histedit too. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 677 diff changeset	634 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	635 except KeyError:
718262019c6f evolve: warn for troubles created by histedit too. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 677 diff changeset	636 pass # rebase not found
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	637
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	638
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	639 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	640 ### Old Evolve extension content ###
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	641 #####################################################################
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	642
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	643 # 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	644
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	645 ### util function
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	646 #############################
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	647
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	648 ### changeset rewriting logic
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	649 #############################
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	650
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	651 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	652 """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	653 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	654 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	655 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	656 """
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	657 if len(old.parents()) > 1: #XXX remove this unecessary limitation.
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	658 raise error.Abort(_('cannot amend merge changesets'))
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	659 base = old.p1()
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	660 updatebookmarks = _bookmarksupdater(repo, old.node())
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	661
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	662 wlock = repo.wlock()
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	663 try:
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	664
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	665 # commit a new version of the old changeset, including the update
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	666 # collect all files which might be affected
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	667 files = set(old.files())
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	668 for u in updates:
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	669 files.update(u.files())
219 cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	670
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	671 # Recompute copies (avoid recording a -> b -> a)
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	672 copied = copies.pathcopies(base, head)
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	673
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	674
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	675 # prune files which were reverted by the updates
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	676 def samefile(f):
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	677 if f in head.manifest():
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	678 a = head.filectx(f)
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	679 if f in base.manifest():
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	680 b = base.filectx(f)
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	681 return (a.data() == b.data()
219 cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	682 and a.flags() == b.flags())
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	683 else:
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	684 return False
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	685 else:
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	686 return f not in base.manifest()
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	687 files = [f for f in files if not samefile(f)]
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	688 # commit version of these files as defined by head
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	689 headmf = head.manifest()
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	690 def filectxfn(repo, ctx, path):
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	691 if path in headmf:
219 cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	692 fctx = head[path]
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	693 flags = fctx.flags()
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	694 mctx = context.memfilectx(fctx.path(), fctx.data(),
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	695 islink='l' in flags,
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	696 isexec='x' in flags,
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	697 copied=copied.get(path))
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	698 return mctx
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	699 raise IOError()
104 6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	700 if commitopts.get('message') and commitopts.get('logfile'):
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	701 raise util.Abort(_('options --message and --logfile are mutually'
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	702 ' exclusive'))
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	703 if commitopts.get('logfile'):
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	704 message= open(commitopts['logfile']).read()
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	705 elif commitopts.get('message'):
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	706 message = commitopts['message']
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	707 else:
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	708 message = old.description()
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	709
142 c2f7a8530e51 overwrite user not date Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 141 diff changeset	710 user = commitopts.get('user') or old.user()
c2f7a8530e51 overwrite user not date Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 141 diff changeset	711 date = commitopts.get('date') or None # old.date()
263 de62daaf2054 amend: drop --branches, pick it from working directory Patrick Mezard <patrick@mezard.eu> parents: 260 diff changeset	712 extra = dict(commitopts.get('extra', {}))
de62daaf2054 amend: drop --branches, pick it from working directory Patrick Mezard <patrick@mezard.eu> parents: 260 diff changeset	713 extra['branch'] = head.branch()
118 06fe05256a79 edit option \o/ Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 117 diff changeset	714
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	715 new = context.memctx(repo,
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	716 parents=newbases,
104 6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	717 text=message,
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	718 files=files,
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	719 filectxfn=filectxfn,
142 c2f7a8530e51 overwrite user not date Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 141 diff changeset	720 user=user,
c2f7a8530e51 overwrite user not date Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 141 diff changeset	721 date=date,
263 de62daaf2054 amend: drop --branches, pick it from working directory Patrick Mezard <patrick@mezard.eu> parents: 260 diff changeset	722 extra=extra)
118 06fe05256a79 edit option \o/ Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 117 diff changeset	723
06fe05256a79 edit option \o/ Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 117 diff changeset	724 if commitopts.get('edit'):
06fe05256a79 edit option \o/ Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 117 diff changeset	725 new._text = cmdutil.commitforceeditor(repo, new, [])
265 24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	726 revcount = len(repo)
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	727 newid = repo.commitctx(new)
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	728 new = repo[newid]
265 24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	729 created = len(repo) != revcount
699 dba3ed9f2c4f amend: prune replacement commit without sucessors Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 696 diff changeset	730 updatebookmarks(newid)
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	731 finally:
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	732 wlock.release()
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	733
265 24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	734 return newid, created
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	735
463 3f91654713dd obsolete Move merge failure handling into stabilize code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 455 diff changeset	736 class MergeFailure(util.Abort):
3f91654713dd obsolete Move merge failure handling into stabilize code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 455 diff changeset	737 pass
3f91654713dd obsolete Move merge failure handling into stabilize code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 455 diff changeset	738
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	739 def relocate(repo, orig, dest):
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	740 """rewrite <rev> on dest"""
64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	741 try:
911 3b7dfa9bb789 evolve: abort when trying to move a node on top of itself Olle Lundberg <geek@nerd.sh> parents: 901 diff changeset	742 if orig.rev() == dest.rev():
3b7dfa9bb789 evolve: abort when trying to move a node on top of itself Olle Lundberg <geek@nerd.sh> parents: 901 diff changeset	743 raise util.Abort(_('tried to relocade a node on top of itself'),
3b7dfa9bb789 evolve: abort when trying to move a node on top of itself Olle Lundberg <geek@nerd.sh> parents: 901 diff changeset	744 hint=_("This shouldn't happen. If you still "
3b7dfa9bb789 evolve: abort when trying to move a node on top of itself Olle Lundberg <geek@nerd.sh> parents: 901 diff changeset	745 "need to move changesets, please do so "
3b7dfa9bb789 evolve: abort when trying to move a node on top of itself Olle Lundberg <geek@nerd.sh> parents: 901 diff changeset	746 "manually with nothing to rebase - working directory parent is also destination"))
3b7dfa9bb789 evolve: abort when trying to move a node on top of itself Olle Lundberg <geek@nerd.sh> parents: 901 diff changeset	747
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	748 rebase = extensions.find('rebase')
64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	749 # dummy state to trick rebase node
776 7eaad1101242 raise util.Abort instead of assertion when trying to evolve a merge changeset. Arne Babenhauserheide <arne.babenhauserheide@kit.edu> parents: 763 diff changeset	750 if not orig.p2().rev() == node.nullrev:
7eaad1101242 raise util.Abort instead of assertion when trying to evolve a merge changeset. Arne Babenhauserheide <arne.babenhauserheide@kit.edu> parents: 763 diff changeset	751 raise util.Abort(
7eaad1101242 raise util.Abort instead of assertion when trying to evolve a merge changeset. Arne Babenhauserheide <arne.babenhauserheide@kit.edu> parents: 763 diff changeset	752 'no support for evolution merge changesets yet',
7eaad1101242 raise util.Abort instead of assertion when trying to evolve a merge changeset. Arne Babenhauserheide <arne.babenhauserheide@kit.edu> parents: 763 diff changeset	753 hint="Redo the merge a use `hg prune` to obsolete the old one")
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	754 destbookmarks = repo.nodebookmarks(dest.node())
258 8337bb3bb958 Fix amend and relocate who picked phases data after extinct wher made secret Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 255 diff changeset	755 nodesrc = orig.node()
8337bb3bb958 Fix amend and relocate who picked phases data after extinct wher made secret Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 255 diff changeset	756 destphase = repo[nodesrc].phase()
923 a94ce5400e1b evolve: protect call to rebase within a wlock (#42, #35, #16) Sean Farley <sean.michael.farley@gmail.com> parents: 915 diff changeset	757 wlock = lock = None
326 52c53e2d413b stabilize: clear error message than conflict during rebase offer no hope Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 319 diff changeset	758 try:
923 a94ce5400e1b evolve: protect call to rebase within a wlock (#42, #35, #16) Sean Farley <sean.michael.farley@gmail.com> parents: 915 diff changeset	759 wlock = repo.wlock()
a94ce5400e1b evolve: protect call to rebase within a wlock (#42, #35, #16) Sean Farley <sean.michael.farley@gmail.com> parents: 915 diff changeset	760 lock = repo.lock()
674 b3ce838a077e evolve: remove pre 2.3 code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 673 diff changeset	761 r = rebase.rebasenode(repo, orig.node(), dest.node(),
b3ce838a077e evolve: remove pre 2.3 code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 673 diff changeset	762 {node.nullrev: node.nullrev}, False)
550 362e65fc6146 evolve-cmd: fix merge error detection for external tools. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 549 diff changeset	763 if r[-1]: #some conflict
362e65fc6146 evolve-cmd: fix merge error detection for external tools. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 549 diff changeset	764 raise util.Abort(
362e65fc6146 evolve-cmd: fix merge error detection for external tools. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 549 diff changeset	765 'unresolved merge conflicts (see hg help resolve)')
901 4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 893 diff changeset	766 cmdutil.duplicatecopies(repo, orig.node(), dest.node())
326 52c53e2d413b stabilize: clear error message than conflict during rebase offer no hope Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 319 diff changeset	767 nodenew = rebase.concludenode(repo, orig.node(), dest.node(),
52c53e2d413b stabilize: clear error message than conflict during rebase offer no hope Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 319 diff changeset	768 node.nullid)
463 3f91654713dd obsolete Move merge failure handling into stabilize code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 455 diff changeset	769 except util.Abort, exc:
3f91654713dd obsolete Move merge failure handling into stabilize code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 455 diff changeset	770 class LocalMergeFailure(MergeFailure, exc.__class__):
3f91654713dd obsolete Move merge failure handling into stabilize code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 455 diff changeset	771 pass
3f91654713dd obsolete Move merge failure handling into stabilize code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 455 diff changeset	772 exc.__class__ = LocalMergeFailure
326 52c53e2d413b stabilize: clear error message than conflict during rebase offer no hope Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 319 diff changeset	773 raise
923 a94ce5400e1b evolve: protect call to rebase within a wlock (#42, #35, #16) Sean Farley <sean.michael.farley@gmail.com> parents: 915 diff changeset	774 finally:
a94ce5400e1b evolve: protect call to rebase within a wlock (#42, #35, #16) Sean Farley <sean.michael.farley@gmail.com> parents: 915 diff changeset	775 lockmod.release(lock, wlock)
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	776 oldbookmarks = repo.nodebookmarks(nodesrc)
284 88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	777 if nodenew is not None:
88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	778 phases.retractboundary(repo, destphase, [nodenew])
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	779 createmarkers(repo, [(repo[nodesrc], (repo[nodenew],))])
284 88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	780 for book in oldbookmarks:
88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	781 repo._bookmarks[book] = nodenew
88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	782 else:
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	783 createmarkers(repo, [(repo[nodesrc], ())])
284 88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	784 # Behave like rebase, move bookmarks to dest
88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	785 for book in oldbookmarks:
88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	786 repo._bookmarks[book] = dest.node()
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	787 for book in destbookmarks: # restore bookmark that rebase move
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	788 repo._bookmarks[book] = dest.node()
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	789 if oldbookmarks or destbookmarks:
612 15299bfd0813 adapt to 7f5dab94e48c in crew Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 604 diff changeset	790 repo._bookmarks.write()
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	791 return nodenew
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	792 except util.Abort:
64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	793 # Invalidate the previous setparents
64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	794 repo.dirstate.invalidate()
64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	795 raise
64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	796
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	797 def _bookmarksupdater(repo, oldid):
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	798 """Return a callable update(newid) updating the current bookmark
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	799 and bookmarks bound to oldid to newid.
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	800 """
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	801 bm = bookmarks.readcurrent(repo)
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	802 def updatebookmarks(newid):
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	803 dirty = False
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	804 if bm:
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	805 repo._bookmarks[bm] = newid
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	806 dirty = True
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	807 oldbookmarks = repo.nodebookmarks(oldid)
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	808 if oldbookmarks:
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	809 for b in oldbookmarks:
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	810 repo._bookmarks[b] = newid
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	811 dirty = True
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	812 if dirty:
612 15299bfd0813 adapt to 7f5dab94e48c in crew Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 604 diff changeset	813 repo._bookmarks.write()
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	814 return updatebookmarks
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	815
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	816 ### new command
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	817 #############################
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	818 cmdtable = {}
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	819 command = cmdutil.command(cmdtable)
716 4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	820 metadataopts = [
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	821 ('d', 'date', '',
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	822 _('record the specified date in metadata'), _('DATE')),
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	823 ('u', 'user', '',
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	824 _('record the specified user in metadata'), _('USER')),
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	825 ]
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	826
930 cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	827 if getattr(mercurial.cmdutil, 'tryimportone', None) is not None:
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	828 # hg 3.0 and greate
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	829 @eh.uisetup
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	830 def _installimportobsolete(ui):
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	831 entry = cmdutil.findcmd('import', commands.table)[1]
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	832 entry[1].append(('', 'obsolete', False,
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	833 _('mark the old node as obsoleted by'
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	834 'the created commit')))
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	835
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	836 @eh.wrapfunction(mercurial.cmdutil, 'tryimportone')
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	837 def tryimportone(orig, ui, repo, hunk, parents, opts, args, *kwargs):
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	838 extracted = patch.extract(ui, hunk)
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	839 expected = extracted[5]
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	840 oldextract = patch.extract
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	841 try:
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	842 patch.extract = lambda ui, hunk: extracted
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	843 ret = orig(ui, repo, hunk, parents, opts, args, *kwargs)
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	844 finally:
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	845 patch.extract = oldextract
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	846 created = ret[1]
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	847 if opts['obsolete'] and created is not None and created != expected:
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	848 tr = repo.transaction('import-obs')
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	849 try:
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	850 metadata = {'user': ui.username()}
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	851 repo.obsstore.create(tr, node.bin(expected), (created,),
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	852 metadata=metadata)
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	853 tr.close()
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	854 finally:
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	855 tr.release()
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	856 return ret
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation Pierre-Yves David <pierre-yves.david@fb.com> parents: 927 diff changeset	857
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	858
714 3867f7b1fe6e evolve: remove duplicate alias. Levi Bard <levi@unity3d.com> parents: 710 diff changeset	859 @command('^evolve\|stabilize\|solve',
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	860 [('n', 'dry-run', False, 'do not perform actions, just print what would be done'),
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	861 ('A', 'any', False, 'evolve any troubled changeset'),
704 2ec7c3673679 evolve: add --all argument. Levi Bard <levi@unity3d.com> parents: 703 diff changeset	862 ('a', 'all', False, 'evolve all troubled changesets'),
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	863 ('c', 'continue', False, 'continue an interrupted evolution'), ],
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	864 _('[OPTIONS]...'))
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	865 def evolve(ui, repo, **opts):
7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	866 """Solve trouble in your repository
7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	867
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	868 - rebase unstable changesets to make them stable again,
36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	869 - create proper diffs from bumped changesets,
36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	870 - merge divergent changesets,
750 ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	871 - update to a successor if the working directory parent is
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	872 obsolete
145 928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	873
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	874 By default, takes the first troubled changeset that looks relevant.
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	875
7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	876 (The logic is still a bit fuzzy)
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	877
708 0ff2251adfe0 evolve: clean up help message Levi Bard <levi@unity3d.com> parents: 707 diff changeset	878 - For unstable, this means taking the first which could be rebased as a
0ff2251adfe0 evolve: clean up help message Levi Bard <levi@unity3d.com> parents: 707 diff changeset	879 child of the working directory parent revision or one of its descendants
0ff2251adfe0 evolve: clean up help message Levi Bard <levi@unity3d.com> parents: 707 diff changeset	880 and rebasing it.
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	881
708 0ff2251adfe0 evolve: clean up help message Levi Bard <levi@unity3d.com> parents: 707 diff changeset	882 - For divergent, this means taking "." if applicable.
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	883
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	884 With --any, evolve picks any troubled changeset to repair.
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	885
7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	886 The working directory is updated to the newly created revision.
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	887 """
145 928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	888
465 4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	889 contopt = opts['continue']
4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	890 anyopt = opts['any']
704 2ec7c3673679 evolve: add --all argument. Levi Bard <levi@unity3d.com> parents: 703 diff changeset	891 allopt = opts['all']
703 a246b02499d9 evolve: extract evolve --any implementation into a function. Levi Bard <levi@unity3d.com> parents: 663 diff changeset	892 dryrunopt = opts['dry_run']
145 928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	893
465 4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	894 if contopt:
4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	895 if anyopt:
4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	896 raise util.Abort('can not specify both "--any" and "--continue"')
704 2ec7c3673679 evolve: add --all argument. Levi Bard <levi@unity3d.com> parents: 703 diff changeset	897 if allopt:
2ec7c3673679 evolve: add --all argument. Levi Bard <levi@unity3d.com> parents: 703 diff changeset	898 raise util.Abort('can not specify both "--all" and "--continue"')
465 4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	899 graftcmd = commands.table['graft'][0]
4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	900 return graftcmd(ui, repo, old_obsolete=True, **{'continue': True})
703 a246b02499d9 evolve: extract evolve --any implementation into a function. Levi Bard <levi@unity3d.com> parents: 663 diff changeset	901
706 90f0a1ede70a evolve: clean up evolve implementation. Levi Bard <levi@unity3d.com> parents: 704 diff changeset	902 tr = _picknexttroubled(ui, repo, anyopt or allopt)
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	903 if tr is None:
750 ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	904 if repo['.'].obsolete():
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	905 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	906 successors = set()
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	907
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	908 for successorsset in obsolete.successorssets(repo, repo['.'].node()):
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	909 for nodeid in successorsset:
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	910 successors.add(repo[nodeid])
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	911
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	912 if not successors:
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	913 ui.warn(_('parent is obsolete without successors; ' +
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	914 'likely killed\n'))
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	915 return 2
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	916
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	917 elif len(successors) > 1:
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	918 ui.warn(_('parent is obsolete with multiple successors:\n'))
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	919
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	920 for ctx in sorted(successors, key=lambda ctx: ctx.rev()):
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	921 displayer.show(ctx)
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	922
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	923 return 2
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	924
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	925 else:
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	926 ctx = successors.pop()
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	927
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	928 ui.status(_('update:'))
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	929 if not ui.quiet:
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	930 displayer.show(ctx)
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	931
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	932 if dryrunopt:
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	933 print 'hg update %s' % ctx.rev()
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	934 return 0
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	935 else:
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	936 return hg.update(repo, ctx.rev())
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 749 diff changeset	937
511 ddeb71df916d evolve: localrepo.revs() already returns a list Patrick Mezard <patrick@mezard.eu> parents: 510 diff changeset	938 troubled = repo.revs('troubled()')
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	939 if troubled:
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	940 ui.write_err(_('nothing to evolve here\n'))
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	941 ui.status(_('(%i troubled changesets, do you want --any ?)\n')
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 466 diff changeset	942 % len(troubled))
145 928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	943 return 2
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	944 else:
722 4e7e7a7d8500 evolve: remove trailing spaces Andr?Sintzoff <andre.sintzoff@gmail.com> parents: 716 diff changeset	945 ui.write_err(_('no troubled changesets\n'))
145 928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	946 return 1
706 90f0a1ede70a evolve: clean up evolve implementation. Levi Bard <levi@unity3d.com> parents: 704 diff changeset	947
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	948 def progresscb():
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	949 if allopt:
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	950 ui.progress('evolve', seen, unit='changesets', total=count)
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	951 seen = 1
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	952 count = allopt and _counttroubled(ui, repo) or 1
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	953
706 90f0a1ede70a evolve: clean up evolve implementation. Levi Bard <levi@unity3d.com> parents: 704 diff changeset	954 while tr is not None:
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	955 progresscb()
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	956 result = _evolveany(ui, repo, tr, dryrunopt, progresscb=progresscb)
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	957 progresscb()
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	958 seen += 1
707 f914e315b717 evolve: remove magic return values from utility functions Levi Bard <levi@unity3d.com> parents: 706 diff changeset	959 if not allopt:
706 90f0a1ede70a evolve: clean up evolve implementation. Levi Bard <levi@unity3d.com> parents: 704 diff changeset	960 return result
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	961 progresscb()
706 90f0a1ede70a evolve: clean up evolve implementation. Levi Bard <levi@unity3d.com> parents: 704 diff changeset	962 tr = _picknexttroubled(ui, repo, anyopt or allopt)
722 4e7e7a7d8500 evolve: remove trailing spaces Andr?Sintzoff <andre.sintzoff@gmail.com> parents: 716 diff changeset	963
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	964 if allopt:
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	965 ui.progress('evolve', None)
706 90f0a1ede70a evolve: clean up evolve implementation. Levi Bard <levi@unity3d.com> parents: 704 diff changeset	966
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	967
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	968 def _evolveany(ui, repo, tr, dryrunopt, progresscb):
651 609faf10d307 evolve: ensure evolve command run unfiltered Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 649 diff changeset	969 repo = repo.unfiltered()
609faf10d307 evolve: ensure evolve command run unfiltered Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 649 diff changeset	970 tr = repo[tr.rev()]
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	971 cmdutil.bailifchanged(repo)
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	972 troubles = tr.troubles()
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 466 diff changeset	973 if 'unstable' in troubles:
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	974 return _solveunstable(ui, repo, tr, dryrunopt, progresscb)
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	975 elif 'bumped' in troubles:
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	976 return _solvebumped(ui, repo, tr, dryrunopt, progresscb)
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	977 elif 'divergent' in troubles:
625 e291e5271694 prepare for Full scale filtering !!! Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 622 diff changeset	978 repo = repo.unfiltered()
e291e5271694 prepare for Full scale filtering !!! Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 622 diff changeset	979 tr = repo[tr.rev()]
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	980 return _solvedivergent(ui, repo, tr, dryrunopt, progresscb)
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	981 else:
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 466 diff changeset	982 assert False # WHAT? unknown troubles
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	983
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	984 def _counttroubled(ui, repo):
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	985 """Count the amount of troubled changesets"""
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	986 troubled = set()
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	987 troubled.update(getrevs(repo, 'unstable'))
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	988 troubled.update(getrevs(repo, 'bumped'))
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	989 troubled.update(getrevs(repo, 'divergent'))
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	990 return len(troubled)
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	991
942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	992 def _picknexttroubled(ui, repo, pickany=False, progresscb=None):
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	993 """Pick a the next trouble changeset to solve"""
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	994 if progresscb: progresscb()
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	995 tr = _stabilizableunstable(repo, repo['.'])
484 20e2f2dd71f1 stabilize: conflicting changeset are considered if "." Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 482 diff changeset	996 if tr is None:
20e2f2dd71f1 stabilize: conflicting changeset are considered if "." Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 482 diff changeset	997 wdp = repo['.']
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	998 if 'divergent' in wdp.troubles():
484 20e2f2dd71f1 stabilize: conflicting changeset are considered if "." Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 482 diff changeset	999 tr = wdp
512 8b25e9cf76fd evolve: avoid 'any' argument name in _picknexttroubled() Patrick Mezard <patrick@mezard.eu> parents: 511 diff changeset	1000 if tr is None and pickany:
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	1001 troubled = list(repo.set('unstable()'))
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 466 diff changeset	1002 if not troubled:
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1003 troubled = list(repo.set('bumped()'))
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	1004 if not troubled:
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1005 troubled = list(repo.set('divergent()'))
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	1006 if troubled:
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 466 diff changeset	1007 tr = troubled[0]
484 20e2f2dd71f1 stabilize: conflicting changeset are considered if "." Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 482 diff changeset	1008
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	1009 return tr
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 466 diff changeset	1010
509 c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1011 def _stabilizableunstable(repo, pctx):
c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1012 """Return a changectx for an unstable changeset which can be
c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1013 stabilized on top of pctx or one of its descendants. None if none
c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1014 can be found.
c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1015 """
c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1016 def selfanddescendants(repo, pctx):
c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1017 yield pctx
636 27c890b4f864 evolve: make evolve smarter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 626 diff changeset	1018 for prec in repo.set('allprecursors(%d)', pctx):
27c890b4f864 evolve: make evolve smarter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 626 diff changeset	1019 yield prec
509 c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1020 for ctx in pctx.descendants():
c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1021 yield ctx
636 27c890b4f864 evolve: make evolve smarter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 626 diff changeset	1022 for prec in repo.set('allprecursors(%d)', ctx):
27c890b4f864 evolve: make evolve smarter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 626 diff changeset	1023 yield prec
509 c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1024
c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1025 # Look for an unstable which can be stabilized as a child of
c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1026 # node. The unstable must be a child of one of node predecessors.
c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1027 for ctx in selfanddescendants(repo, pctx):
636 27c890b4f864 evolve: make evolve smarter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 626 diff changeset	1028 for child in ctx.children():
27c890b4f864 evolve: make evolve smarter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 626 diff changeset	1029 if child.unstable():
27c890b4f864 evolve: make evolve smarter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 626 diff changeset	1030 return child
509 c072e559746d evolve: move _stabilizableunstable() with related functions Patrick Mezard <patrick@mezard.eu> parents: 507 diff changeset	1031 return None
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	1032
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	1033 def _solveunstable(ui, repo, orig, dryrun=False, progresscb=None):
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	1034 """Stabilize a unstable changeset"""
464 d88c761f97c4 stabilize: rename "node" variable to "orig" Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 463 diff changeset	1035 obs = orig.parents()[0]
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	1036 if not obs.obsolete():
636 27c890b4f864 evolve: make evolve smarter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 626 diff changeset	1037 print obs.rev(), orig.parents()
27c890b4f864 evolve: make evolve smarter Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 626 diff changeset	1038 print orig.rev()
464 d88c761f97c4 stabilize: rename "node" variable to "orig" Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 463 diff changeset	1039 obs = orig.parents()[1]
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	1040 assert obs.obsolete()
630 722b52c75f02 compat: adapt to upstreaming of divergent logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 622 diff changeset	1041 newer = obsolete.successorssets(repo, obs.node())
466 b98490b689a5 stabilize: handle killed changeset in stabilize. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 465 diff changeset	1042 # 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	1043 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	1044 ui.debug("stabilize target %s is plain dead,"
517 0bc0c9edcb15 evolve: usual syntax/grammar errors/long lines cleanup Patrick Mezard <patrick@mezard.eu> parents: 516 diff changeset	1045 " trying to stabilize on its parent")
466 b98490b689a5 stabilize: handle killed changeset in stabilize. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 465 diff changeset	1046 obs = obs.parents()[0]
630 722b52c75f02 compat: adapt to upstreaming of divergent logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 622 diff changeset	1047 newer = obsolete.successorssets(repo, obs.node())
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1048 if len(newer) > 1:
707 f914e315b717 evolve: remove magic return values from utility functions Levi Bard <levi@unity3d.com> parents: 706 diff changeset	1049 raise util.Abort(_("conflict rewriting. can't choose destination\n"))
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1050 targets = newer[0]
466 b98490b689a5 stabilize: handle killed changeset in stabilize. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 465 diff changeset	1051 assert targets
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1052 if len(targets) > 1:
707 f914e315b717 evolve: remove magic return values from utility functions Levi Bard <levi@unity3d.com> parents: 706 diff changeset	1053 raise util.Abort(_("does not handle split parents yet\n"))
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1054 return 2
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1055 target = targets[0]
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1056 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	1057 target = repo[target]
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1058 repo.ui.status(_('move:'))
146 e80a6c8ad452 stabilize: proper --quiet behavior Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 145 diff changeset	1059 if not ui.quiet:
464 d88c761f97c4 stabilize: rename "node" variable to "orig" Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 463 diff changeset	1060 displayer.show(orig)
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1061 repo.ui.status(_('atop:'))
146 e80a6c8ad452 stabilize: proper --quiet behavior Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 145 diff changeset	1062 if not ui.quiet:
e80a6c8ad452 stabilize: proper --quiet behavior Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 145 diff changeset	1063 displayer.show(target)
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	1064 if progresscb: progresscb()
546 415540dee2bd fix missing --dest evolve output in dryrun Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 540 diff changeset	1065 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	1066 if dryrun:
146 e80a6c8ad452 stabilize: proper --quiet behavior Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 145 diff changeset	1067 repo.ui.write(todo)
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1068 else:
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1069 repo.ui.note(todo)
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	1070 if progresscb: progresscb()
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1071 lock = repo.lock()
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1072 try:
464 d88c761f97c4 stabilize: rename "node" variable to "orig" Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 463 diff changeset	1073 relocate(repo, orig, target)
463 3f91654713dd obsolete Move merge failure handling into stabilize code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 455 diff changeset	1074 except MergeFailure:
465 4a039a8c1cf3 stabilize: --continue support !!! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 464 diff changeset	1075 repo.opener.write('graftstate', orig.hex() + '\n')
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	1076 repo.ui.write_err(_('evolve failed!\n'))
7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	1077 repo.ui.write_err(_('fix conflict and run "hg evolve --continue"\n'))
463 3f91654713dd obsolete Move merge failure handling into stabilize code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 455 diff changeset	1078 raise
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1079 finally:
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	1080 lock.release()
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	1081
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	1082 def _solvebumped(ui, repo, bumped, dryrun=False, progresscb=None):
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1083 """Stabilize a bumped changeset"""
26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1084 # For now we deny bumped merge
26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1085 if len(bumped.parents()) > 1:
26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1086 raise util.Abort('late comer stabilization is confused by bumped'
26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1087 ' %s being a merge' % bumped)
26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1088 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	1089 # For now we deny target merge
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1090 if len(prec.parents()) > 1:
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	1091 raise util.Abort('late comer evolution is confused by precursors'
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1092 ' %s being a merge' % prec)
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1093
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1094 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1095 repo.ui.status(_('recreate:'))
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1096 if not ui.quiet:
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1097 displayer.show(bumped)
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1098 repo.ui.status(_('atop:'))
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1099 if not ui.quiet:
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1100 displayer.show(prec)
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1101 if dryrun:
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1102 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	1103 repo.ui.write(todo)
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1104 repo.ui.write('hg update %s;\n' % prec)
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1105 repo.ui.write('hg revert --all --rev %s;\n' % bumped)
26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1106 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	1107 return 0
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	1108 if progresscb: progresscb()
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1109 wlock = repo.wlock()
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1110 try:
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1111 newid = tmpctx = None
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1112 tmpctx = bumped
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1113 lock = repo.lock()
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1114 try:
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1115 bmupdate = _bookmarksupdater(repo, bumped.node())
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1116 # Basic check for common parent. Far too complicated and fragile
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1117 tr = repo.transaction('bumped-stabilize')
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1118 try:
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1119 if not list(repo.set('parents(%d) and parents(%d)', bumped, prec)):
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1120 # Need to rebase the changeset at the right place
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1121 repo.ui.status(_('rebasing to destination parent: %s\n') % prec.p1())
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1122 try:
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1123 tmpid = relocate(repo, bumped, prec.p1())
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1124 if tmpid is not None:
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1125 tmpctx = repo[tmpid]
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1126 createmarkers(repo, [(bumped, (tmpctx,))])
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1127 except MergeFailure:
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1128 repo.opener.write('graftstate', bumped.hex() + '\n')
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	1129 repo.ui.write_err(_('evolution failed!\n'))
7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	1130 repo.ui.write_err(_('fix conflict and run "hg evolve --continue"\n'))
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1131 raise
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1132 # Create the new commit context
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1133 repo.ui.status(_('computing new diff\n'))
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1134 files = set()
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1135 copied = copies.pathcopies(prec, bumped)
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1136 precmanifest = prec.manifest()
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1137 for key, val in bumped.manifest().iteritems():
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1138 if precmanifest.pop(key, None) != val:
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1139 files.add(key)
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1140 files.update(precmanifest) # add missing files
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1141 # commit it
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1142 if files: # something to commit!
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1143 def filectxfn(repo, ctx, path):
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1144 if path in bumped:
26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1145 fctx = bumped[path]
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1146 flags = fctx.flags()
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1147 mctx = context.memfilectx(fctx.path(), fctx.data(),
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1148 islink='l' in flags,
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1149 isexec='x' in flags,
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1150 copied=copied.get(path))
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1151 return mctx
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1152 raise IOError()
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1153 text = 'bumped update to %s:\n\n' % prec
26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1154 text += bumped.description()
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1155
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1156 new = context.memctx(repo,
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1157 parents=[prec.node(), node.nullid],
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1158 text=text,
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1159 files=files,
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1160 filectxfn=filectxfn,
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1161 user=bumped.user(),
26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1162 date=bumped.date(),
26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1163 extra=bumped.extra())
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1164
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1165 newid = repo.commitctx(new)
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1166 if newid is None:
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1167 createmarkers(repo, [(tmpctx, ())])
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1168 newid = prec.node()
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1169 else:
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 588 diff changeset	1170 phases.retractboundary(repo, bumped.phase(), [newid])
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1171 createmarkers(repo, [(tmpctx, (repo[newid],))],
857 c479e24ebddf evolve: use flag value from core for bumped fix Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 855 diff changeset	1172 flag=obsolete.bumpedfix)
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1173 bmupdate(newid)
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1174 tr.close()
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1175 repo.ui.status(_('commited as %s\n') % node.short(newid))
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1176 finally:
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1177 tr.release()
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1178 finally:
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1179 lock.release()
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1180 # reroute the working copy parent to the new changeset
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1181 repo.dirstate.setparents(newid, node.nullid)
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1182 finally:
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1183 wlock.release()
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1184
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	1185 def _solvedivergent(ui, repo, divergent, dryrun=False, progresscb=None):
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1186 base, others = divergentdata(divergent)
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1187 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	1188 othersstr = "[%s]" % (','.join([str(i) for i in others]))
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	1189 hint = ("changeset %d is divergent with a changeset that got splitted "
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	1190 "\| into multiple ones:\n[%s]\n"
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	1191 "\| This is not handled by automatic evolution yet\n"
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	1192 "\| You have to fallback to manual handling with commands as:\n"
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	1193 "\| - hg touch -D\n"
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	1194 "\| - hg prune\n"
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	1195 "\| \n"
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	1196 "\| You should contact your local evolution Guru for help.\n"
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	1197 % (divergent, othersstr))
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	1198 raise util.Abort("We do not handle divergence with split yet",
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	1199 hint='')
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1200 other = others[0]
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1201 if divergent.phase() <= phases.public:
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	1202 raise util.Abort("We can't resolve this conflict from the public side",
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	1203 hint="%s is public, try from %s" % (divergent, other))
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1204 if len(other.parents()) > 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	1205 raise util.Abort("divergent changeset can't be a merge (yet)",
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	1206 hint="You have to fallback to solving this by hand...\n"
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	1207 "\| This probably mean to redo the merge and use "
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	1208 "\| `hg prune` to kill older version.")
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1209 if other.p1() not in divergent.parents():
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	1210 raise util.Abort("parents are not common (not handled yet)",
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	1211 hint="\| %(d)s, %(o)s are not based on the same changeset."
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	1212 "\| With the current state of its implementation, "
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	1213 "\| evolve does not work in that case.\n"
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	1214 "\| rebase one of them next to the other and run "
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	1215 "\| this command again.\n"
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	1216 "\| - either: hg rebase -dest 'p1(%(d)s)' -r %(o)s"
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	1217 "\| - or: hg rebase -dest 'p1(%(d)s)' -r %(o)s"
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	1218 % {'d': divergent, 'o': other})
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1219
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1220 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1221 ui.status(_('merge:'))
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1222 if not ui.quiet:
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1223 displayer.show(divergent)
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1224 ui.status(_('with: '))
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1225 if not ui.quiet:
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1226 displayer.show(other)
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1227 ui.status(_('base: '))
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1228 if not ui.quiet:
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1229 displayer.show(base)
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1230 if dryrun:
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1231 ui.write('hg update -c %s &&\n' % divergent)
533 87c41ef95ebf test conflicting conflicting (sic) resolution Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 523 diff changeset	1232 ui.write('hg merge %s &&\n' % other)
517 0bc0c9edcb15 evolve: usual syntax/grammar errors/long lines cleanup Patrick Mezard <patrick@mezard.eu> parents: 516 diff changeset	1233 ui.write('hg commit -m "auto merge resolving conflict between '
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1234 '%s and %s"&&\n' % (divergent, other))
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1235 ui.write('hg up -C %s &&\n' % base)
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1236 ui.write('hg revert --all --rev tip &&\n')
517 0bc0c9edcb15 evolve: usual syntax/grammar errors/long lines cleanup Patrick Mezard <patrick@mezard.eu> parents: 516 diff changeset	1237 ui.write('hg commit -m "`hg log -r %s --template={desc}`";\n'
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1238 % divergent)
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1239 return
516 18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1240 wlock = lock = None
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1241 try:
516 18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1242 wlock = repo.wlock()
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1243 lock = repo.lock()
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1244 if divergent not in repo[None].parents():
516 18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1245 repo.ui.status(_('updating to "local" conflict\n'))
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1246 hg.update(repo, divergent.rev())
f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1247 repo.ui.note(_('merging divergent changeset\n'))
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	1248 if progresscb: progresscb()
516 18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1249 stats = merge.update(repo,
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1250 other.node(),
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1251 branchmerge=True,
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1252 force=False,
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1253 partial=None,
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1254 ancestor=base.node(),
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1255 mergeancestor=True)
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1256 hg._showstats(repo, stats)
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1257 if stats[3]:
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1258 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1259 "or 'hg update -C .' to abandon\n"))
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1260 if stats[3] > 0:
534 45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1261 raise util.Abort('Merge conflict between several amendments, and this is not yet automated',
45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1262 hint="""/!\ You can try:
45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1263 /!\ * manual merge + resolve => new cset X
45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1264 /!\ * 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	1265 /!\ * hg revert --all -r X
45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1266 /!\ * hg ci -m "same message as the amended changeset" => new cset Y
45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1267 /!\ * hg kill -n Y W Z
45ccaba212f9 a better msg for this tricky situation Aurelien Campeas <aurelien.campeas@logilab.fr> parents: 533 diff changeset	1268 """)
762 942aabaa8a8e evolve: show progress Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 760 diff changeset	1269 if progresscb: progresscb()
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1270 tr = repo.transaction('stabilize-divergent')
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1271 try:
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1272 repo.dirstate.setparents(divergent.node(), node.nullid)
516 18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1273 oldlen = len(repo)
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 741 diff changeset	1274 amend(ui, repo, message='', logfile='')
516 18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1275 if oldlen == len(repo):
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1276 new = divergent
516 18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1277 # no changes
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1278 else:
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1279 new = repo['.']
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1280 createmarkers(repo, [(other, (new,))])
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1281 phases.retractboundary(repo, other.phase(), [new.node()])
18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1282 tr.close()
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1283 finally:
516 18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1284 tr.release()
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1285 finally:
516 18854dbc92e7 evolve: simplify locking in _solveconflicting() Patrick Mezard <patrick@mezard.eu> parents: 515 diff changeset	1286 lockmod.release(lock, wlock)
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1287
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1288
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 585 diff changeset	1289 def divergentdata(ctx):
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1290 """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	1291
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1292 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	1293
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1294 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	1295 """
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1296 for base in ctx._repo.set('reverse(precursors(%d))', ctx):
630 722b52c75f02 compat: adapt to upstreaming of divergent logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 622 diff changeset	1297 newer = obsolete.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	1298 # 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	1299 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	1300 if newer:
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1301 return base, tuple(ctx._repo[o] for o in newer[0])
749 f728edc7fcd1 evolve: abort on unknown divergent changeset base Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 745 diff changeset	1302 raise util.Abort('base of divergent changeset not found',
f728edc7fcd1 evolve: abort on unknown divergent changeset base Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 745 diff changeset	1303 hint='this case is not yet handled')
485 41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1304
41bf6c27a122 evolve: stabilize now handle conflicting changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 484 diff changeset	1305
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	1306
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	1307 shorttemplate = '[{rev}] {desc\|firstline}\n'
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	1308
751 a5474648a9d2 gdown/gup: add next/previous alias Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 750 diff changeset	1309 @command('^gdown\|previous',
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	1310 [],
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	1311 '')
751 a5474648a9d2 gdown/gup: add next/previous alias Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 750 diff changeset	1312 def cmdprevious(ui, repo):
724 fa049c1d9445 evolve: fix typo Andr? Sintzoff <andre.sintzoff@gmail.com> parents: 723 diff changeset	1313 """update to parent and display summary lines"""
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	1314 wkctx = repo[None]
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	1315 wparents = wkctx.parents()
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	1316 if len(wparents) != 1:
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	1317 raise util.Abort('merge in progress')
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	1318
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	1319 parents = wparents[0].parents()
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	1320 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
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	1321 if len(parents) == 1:
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	1322 p = parents[0]
892 947fb5b1915b evolve: active bookmark should move when using prev/next (#37) Olle Lundberg <geek@nerd.sh> parents: 891 diff changeset	1323 bm = bookmarks.readcurrent(repo)
947fb5b1915b evolve: active bookmark should move when using prev/next (#37) Olle Lundberg <geek@nerd.sh> parents: 891 diff changeset	1324 shouldmove = bm is not None and bookmarks.iscurrent(repo, bm)
947fb5b1915b evolve: active bookmark should move when using prev/next (#37) Olle Lundberg <geek@nerd.sh> parents: 891 diff changeset	1325 ret = hg.update(repo, p.rev())
947fb5b1915b evolve: active bookmark should move when using prev/next (#37) Olle Lundberg <geek@nerd.sh> parents: 891 diff changeset	1326 if not ret and shouldmove:
947fb5b1915b evolve: active bookmark should move when using prev/next (#37) Olle Lundberg <geek@nerd.sh> parents: 891 diff changeset	1327 repo._bookmarks[bm] = p.node()
947fb5b1915b evolve: active bookmark should move when using prev/next (#37) Olle Lundberg <geek@nerd.sh> parents: 891 diff changeset	1328 repo._bookmarks.write()
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	1329 displayer.show(p)
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	1330 return 0
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	1331 else:
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	1332 for p in parents:
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	1333 displayer.show(p)
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	1334 ui.warn(_('multiple parents, explicitly update to one\n'))
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	1335 return 1
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	1336
751 a5474648a9d2 gdown/gup: add next/previous alias Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 750 diff changeset	1337 @command('^gup\|next',
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	1338 [],
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	1339 '')
751 a5474648a9d2 gdown/gup: add next/previous alias Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 750 diff changeset	1340 def cmdnext(ui, repo):
724 fa049c1d9445 evolve: fix typo Andr? Sintzoff <andre.sintzoff@gmail.com> parents: 723 diff changeset	1341 """update to child and display summary lines"""
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	1342 wkctx = repo[None]
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	1343 wparents = wkctx.parents()
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	1344 if len(wparents) != 1:
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	1345 raise util.Abort('merge in progress')
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	1346
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	1347 children = [ctx for ctx in wparents[0].children() if not ctx.obsolete()]
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	1348 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
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	1349 if not children:
743 af74a5cdf96b conform to the Mercurial custom of lowercase messages Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 742 diff changeset	1350 ui.warn(_('no non-obsolete children\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	1351 return 1
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	1352 if len(children) == 1:
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	1353 c = children[0]
892 947fb5b1915b evolve: active bookmark should move when using prev/next (#37) Olle Lundberg <geek@nerd.sh> parents: 891 diff changeset	1354 bm = bookmarks.readcurrent(repo)
947fb5b1915b evolve: active bookmark should move when using prev/next (#37) Olle Lundberg <geek@nerd.sh> parents: 891 diff changeset	1355 shouldmove = bm is not None and bookmarks.iscurrent(repo, bm)
947fb5b1915b evolve: active bookmark should move when using prev/next (#37) Olle Lundberg <geek@nerd.sh> parents: 891 diff changeset	1356 ret = hg.update(repo, c.rev())
947fb5b1915b evolve: active bookmark should move when using prev/next (#37) Olle Lundberg <geek@nerd.sh> parents: 891 diff changeset	1357 if not ret and shouldmove:
947fb5b1915b evolve: active bookmark should move when using prev/next (#37) Olle Lundberg <geek@nerd.sh> parents: 891 diff changeset	1358 repo._bookmarks[bm] = c.node()
947fb5b1915b evolve: active bookmark should move when using prev/next (#37) Olle Lundberg <geek@nerd.sh> parents: 891 diff changeset	1359 repo._bookmarks.write()
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	1360 displayer.show(c)
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	1361 return 0
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	1362 else:
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	1363 for c in children:
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	1364 displayer.show(c)
743 af74a5cdf96b conform to the Mercurial custom of lowercase messages Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 742 diff changeset	1365 ui.warn(_('multiple non-obsolete children, explicitly update to one\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	1366 return 1
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	1367
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1368 def _reachablefrombookmark(repo, revs, mark):
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1369 """filter revisions and bookmarks reachable from the given bookmark
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1370 yoinked from mq.py
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1371 """
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1372 marks = repo._bookmarks
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1373 if mark not in marks:
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1374 raise util.Abort(_("bookmark '%s' not found") % mark)
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1375
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1376 # 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	1377 # 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	1378 # anything. revsets cannot detect that case.
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1379 uniquebm = True
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1380 for m, n in marks.iteritems():
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1381 if m != mark and n == repo[mark].node():
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1382 uniquebm = False
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1383 break
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1384 if uniquebm:
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1385 rsrevs = repo.revs("ancestors(bookmark(%s)) - "
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1386 "ancestors(head() and not bookmark(%s)) - "
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1387 "ancestors(bookmark() and not bookmark(%s)) - "
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1388 "obsolete()",
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1389 mark, mark, mark)
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1390 revs.update(set(rsrevs))
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1391 return marks,revs
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1392
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1393 def _deletebookmark(ui, marks, mark):
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1394 del marks[mark]
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1395 marks.write()
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1396 ui.write(_("bookmark '%s' deleted\n") % mark)
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1397
716 4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1398
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1399
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1400 def _getmetadata(**opts):
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1401 metadata = {}
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1402 date = opts.get('date')
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1403 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	1404 if date:
716 4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1405 metadata['date'] = '%i %i' % util.parsedate(date)
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1406 if user:
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1407 metadata['user'] = user
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1408 return metadata
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1409
4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1410
365 9f6a77ec66cb evolve: switch the official name for "kill" to prune Pierre-Yves.David@ens-lyon.org parents: 362 diff changeset	1411 @command('^prune\|obsolete\|kill',
682 6cbb52a8401b prune: rename --new to --succ Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 681 diff changeset	1412 [('n', 'new', [], _("successor changeset (DEPRECATED)")),
6cbb52a8401b prune: rename --new to --succ Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 681 diff changeset	1413 ('s', 'succ', [], _("successor changeset")),
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1414 ('r', 'rev', [], _("revisions to prune")),
789 0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1415 ('', 'biject', False, _("do a 1-1 map between rev and successor ranges")),
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1416 ('B', 'bookmark', '', _("remove revs only reachable from given"
716 4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1417 " bookmark"))] + metadataopts,
644 8e41d5b78dff support -r option in prune, add a test for this Denis Laxalde <denis.laxalde@logilab.fr> parents: 636 diff changeset	1418 _('[OPTION] [-r] REV...'))
690 929d7617a13d prune: more command switch idea Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 689 diff changeset	1419 # -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	1420 def cmdprune(ui, repo, revs, *opts):
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	1421 """hide changesets by marking them obsolete
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1422
689 d48aae167b9d prune: documentation update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 688 diff changeset	1423 Obsolete changesets becomes invisible to all commands.
d48aae167b9d prune: documentation update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 688 diff changeset	1424
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	1425 Unpruned descendants of pruned changesets becomes "unstable". Use the
689 d48aae167b9d prune: documentation update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 688 diff changeset	1426 :hg:`evolve` to handle such situation.
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1427
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	1428 When the working directory parent is pruned, the repository is updated to a
36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	1429 non-obsolete parent.
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1430
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	1431 You can use the ``--succ`` option to inform mercurial that a newer version
689 d48aae167b9d prune: documentation update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 688 diff changeset	1432 of the pruned changeset exists.
789 0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1433
0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1434 You can use the ``--biject`` option to specify a 1-1 (bijection) between
0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1435 revisions to prune and successor changesets. This option may be removed in
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	1436 a future release (with the functionality absorbed automatically).
789 0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1437
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1438 """
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1439 revs = set(scmutil.revrange(repo, list(revs) + opts.get('rev')))
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1440 succs = opts['new'] + opts['succ']
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1441 bookmark = opts.get('bookmark')
716 4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1442 metadata = _getmetadata(**opts)
789 0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1443 biject = opts.get('biject')
689 d48aae167b9d prune: documentation update Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 688 diff changeset	1444
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1445 if bookmark:
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1446 marks,revs = _reachablefrombookmark(repo, revs, bookmark)
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1447 if not revs:
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1448 # no revisions to prune - delete bookmark immediately
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1449 _deletebookmark(ui, marks, bookmark)
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1450
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1451 if not revs:
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1452 raise util.Abort(_('nothing to prune'))
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1453
683 6d24bd455f79 simplify locking in prune Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 682 diff changeset	1454 wlock = lock = None
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1455 wlock = repo.wlock()
685 7398f9729821 prune: add test and more robusness Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 684 diff changeset	1456 sortedrevs = lambda specs: sorted(set(scmutil.revrange(repo, specs)))
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1457 try:
444 aedb6b8ace86 drop repo.addobsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	1458 lock = repo.lock()
691 6e63b4185a5c prune: update inline documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 690 diff changeset	1459 # defines pruned changesets
684 19a1a8f93c07 prune: detect bad input Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 683 diff changeset	1460 precs = []
685 7398f9729821 prune: add test and more robusness Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 684 diff changeset	1461 for p in sortedrevs(revs):
684 19a1a8f93c07 prune: detect bad input Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 683 diff changeset	1462 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	1463 if not cp.mutable():
927 154510dc4318 evolve: fix grammar in a comment Greg Ward <greg@gerg.ca> parents: 925 diff changeset	1464 # note: createmarkers() would have raised something anyway
687 6c1fbef2952e prune: test and improve message of immutable aborting. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 685 diff changeset	1465 raise util.Abort('cannot prune immutable changeset: %s' % cp,
6c1fbef2952e prune: test and improve message of immutable aborting. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 685 diff changeset	1466 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	1467 precs.append(cp)
19a1a8f93c07 prune: detect bad input Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 683 diff changeset	1468 if not precs:
683 6d24bd455f79 simplify locking in prune Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 682 diff changeset	1469 raise util.Abort('nothing to prune')
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1470
691 6e63b4185a5c prune: update inline documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 690 diff changeset	1471 # defines successors changesets
685 7398f9729821 prune: add test and more robusness Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 684 diff changeset	1472 sucs = tuple(repo[n] for n in sortedrevs(succs))
789 0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1473 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	1474 msg = "Can't use multiple successors for multiple precursors"
19a1a8f93c07 prune: detect bad input Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 683 diff changeset	1475 raise util.Abort(msg)
789 0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1476
0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1477 if biject and len(sucs) != len(precs):
0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1478 msg = "Can't use %d successors for %d precursors" % (len(sucs), len(precs))
0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1479 raise util.Abort(msg)
0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1480
0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1481 relations = [(p, sucs) for p in precs]
0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1482 if biject:
0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1483 relations = [(p, (s,)) for p, s in zip(precs, sucs)]
0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1484
691 6e63b4185a5c prune: update inline documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 690 diff changeset	1485 # create markers
789 0d2bb0282e78 prune: add biject option Sean Farley <sean.michael.farley@gmail.com> parents: 788 diff changeset	1486 createmarkers(repo, relations, metadata=metadata)
716 4c0f6d555032 prune: add --user and --date options Levi Bard <levi@unity3d.com> parents: 715 diff changeset	1487
688 f2c3fd21fa63 prune: add an informative message about the number of pruned changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 687 diff changeset	1488 # informs that changeset have been pruned
f2c3fd21fa63 prune: add an informative message about the number of pruned changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 687 diff changeset	1489 ui.status(_('%i changesets pruned\n') % len(precs))
931 32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	1490
683 6d24bd455f79 simplify locking in prune Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 682 diff changeset	1491 wdp = repo['.']
931 32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	1492
32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	1493 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	1494 # '.' 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	1495 newnode = sucs[0]
32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	1496 else:
32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	1497 # 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	1498 newnode = wdp
32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	1499
32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	1500 while newnode.obsolete():
32915143d448 prune: update to successor rather than parent when prune '.' Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 930 diff changeset	1501 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	1502
683 6d24bd455f79 simplify locking in prune Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 682 diff changeset	1503 if newnode.node() != wdp.node():
6d24bd455f79 simplify locking in prune Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 682 diff changeset	1504 commands.update(ui, repo, newnode.rev())
6d24bd455f79 simplify locking in prune Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 682 diff changeset	1505 ui.status(_('working directory now at %s\n') % newnode)
715 070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1506 # update bookmarks
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1507 if bookmark:
070bbbb0e6f2 prune: add strip-like bookmark Levi Bard <levi@unity3d.com> parents: 714 diff changeset	1508 _deletebookmark(ui, marks, bookmark)
693 d3c1fe0035d1 prune: handle bookmark Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 691 diff changeset	1509 for ctx in repo.unfiltered().set('bookmark() and %ld', precs):
d3c1fe0035d1 prune: handle bookmark Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 691 diff changeset	1510 ldest = list(repo.set('max((::%d) - obsolete())', ctx))
d3c1fe0035d1 prune: handle bookmark Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 691 diff changeset	1511 if ldest:
d3c1fe0035d1 prune: handle bookmark Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 691 diff changeset	1512 dest = ldest[0]
d3c1fe0035d1 prune: handle bookmark Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 691 diff changeset	1513 updatebookmarks = _bookmarksupdater(repo, ctx.node())
d3c1fe0035d1 prune: handle bookmark Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 691 diff changeset	1514 updatebookmarks(dest.node())
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1515 finally:
683 6d24bd455f79 simplify locking in prune Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 682 diff changeset	1516 lockmod.release(lock, wlock)
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1517
673 761b5b266985 evolve: removes amend from the list of advertised function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 672 diff changeset	1518 @command('amend\|refresh',
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1519 [('A', 'addremove', None,
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1520 _('mark new/missing files as added/removed before committing')),
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	1521 ('e', 'edit', False, _('invoke editor on commit messages')),
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 741 diff changeset	1522 ('', 'close-branch', None,
760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 741 diff changeset	1523 _('mark a branch as closed, hiding it from the branch list')),
760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 741 diff changeset	1524 ('s', 'secret', None, _('use the secret phase for committing')),
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1525 ] + walkopts + commitopts + commitopts2,
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1526 _('[OPTION]... [FILE]...'))
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1527 def amend(ui, repo, pats, *opts):
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1528 """combine a changeset with updates and replace it with a new one
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1529
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1530 Commits a new changeset incorporating both the changes to the given files
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1531 and all the changes from the current parent changeset into the repository.
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1532
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1533 See :hg:`commit` for details about committing changes.
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1534
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1535 If you don't specify -m, the parent's message will be reused.
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1536
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1537 Behind the scenes, Mercurial first commits the update as a regular child
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1538 of the current parent. Then it creates a new commit on the parent's parents
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1539 with the updated contents. Then it changes the working copy parent to this
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1540 new combined changeset. Finally, the old changeset and its update are hidden
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1541 from :hg:`log` (unless you use --hidden with log).
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1542
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1543 Returns 0 on success, 1 if nothing changed.
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	1544 """
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 741 diff changeset	1545 opts = opts.copy()
760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 741 diff changeset	1546 edit = opts.pop('edit', False)
760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 741 diff changeset	1547 opts['amend'] = True
760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 741 diff changeset	1548 if not (edit or opts['message']):
760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 741 diff changeset	1549 opts['message'] = repo['.'].description()
760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 741 diff changeset	1550 _alias, commitcmd = cmdutil.findcmd('commit', commands.table)
760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 741 diff changeset	1551 return commitcmd[0](ui, repo, pats, *opts)
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	1552
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1553 def _commitfiltered(repo, ctx, match):
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1554 """Recommit ctx with changed files not in match. Return the new
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1555 node identifier, or None if nothing changed.
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1556 """
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1557 base = ctx.p1()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1558 m, a, r = repo.status(base, ctx)[:3]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1559 allfiles = set(m + a + r)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1560 files = set(f for f in allfiles if not match(f))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1561 if files == allfiles:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1562 return None
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1563
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1564 # Filter copies
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1565 copied = copies.pathcopies(base, ctx)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1566 copied = dict((src, dst) for src, dst in copied.iteritems()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1567 if dst in files)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1568 def filectxfn(repo, memctx, path):
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1569 if path not in ctx:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1570 raise IOError()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1571 fctx = ctx[path]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1572 flags = fctx.flags()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1573 mctx = context.memfilectx(fctx.path(), fctx.data(),
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1574 islink='l' in flags,
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1575 isexec='x' in flags,
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1576 copied=copied.get(path))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1577 return mctx
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1578
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1579 new = context.memctx(repo,
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1580 parents=[base.node(), node.nullid],
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1581 text=ctx.description(),
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1582 files=files,
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1583 filectxfn=filectxfn,
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1584 user=ctx.user(),
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1585 date=ctx.date(),
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1586 extra=ctx.extra())
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1587 # commitctx always create a new revision, no need to check
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1588 newid = repo.commitctx(new)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1589 return newid
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1590
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1591 def _uncommitdirstate(repo, oldctx, match):
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1592 """Fix the dirstate after switching the working directory from
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1593 oldctx to a copy of oldctx not containing changed files matched by
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1594 match.
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1595 """
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1596 ctx = repo['.']
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1597 ds = repo.dirstate
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1598 copies = dict(ds.copies())
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1599 m, a, r = repo.status(oldctx.p1(), oldctx, match=match)[:3]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1600 for f in m:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1601 if ds[f] == 'r':
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1602 # modified + removed -> removed
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1603 continue
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1604 ds.normallookup(f)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1605
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1606 for f in a:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1607 if ds[f] == 'r':
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1608 # added + removed -> unknown
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1609 ds.drop(f)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1610 elif ds[f] != 'a':
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1611 ds.add(f)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1612
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1613 for f in r:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1614 if ds[f] == 'a':
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1615 # removed + added -> normal
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1616 ds.normallookup(f)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1617 elif ds[f] != 'r':
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1618 ds.remove(f)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1619
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1620 # Merge old parent and old working dir copies
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1621 oldcopies = {}
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1622 for f in (m + a):
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1623 src = oldctx[f].renamed()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1624 if src:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1625 oldcopies[f] = src[0]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1626 oldcopies.update(copies)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1627 copies = dict((dst, oldcopies.get(src, src))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1628 for dst, src in oldcopies.iteritems())
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1629 # Adjust the dirstate copies
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1630 for dst, src in copies.iteritems():
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1631 if (src not in ctx or dst in ctx or ds[dst] != 'a'):
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1632 src = None
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1633 ds.copy(src, dst)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1634
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1635 @command('^uncommit',
314 ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	1636 [('a', 'all', None, _('uncommit all changes when no arguments given')),
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	1637 ] + commands.walkopts,
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1638 _('[OPTION]... [NAME]'))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1639 def uncommit(ui, repo, pats, *opts):
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1640 """move changes from parent revision to working directory
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1641
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	1642 Changes to selected files in the checked out revision appear again as
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1643 uncommitted changed in the working directory. A new revision
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	1644 without the selected changes is created, becomes the checked out
36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	1645 revision, and obsoletes the previous one.
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1646
867 6a67606e1c34 evolve: fix typos in uncommit docstring Andr? Sintzoff <andre.sintzoff@gmail.com> parents: 858 diff changeset	1647 The --include option specifies patterns to uncommit.
6a67606e1c34 evolve: fix typos in uncommit docstring Andr? Sintzoff <andre.sintzoff@gmail.com> parents: 858 diff changeset	1648 The --exclude option specifies patterns to keep in the commit.
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1649
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1650 Return 0 if changed files are uncommitted.
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1651 """
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1652 lock = repo.lock()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1653 try:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1654 wlock = repo.wlock()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1655 try:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1656 wctx = repo[None]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1657 if len(wctx.parents()) <= 0:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1658 raise util.Abort(_("cannot uncommit null changeset"))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1659 if len(wctx.parents()) > 1:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1660 raise util.Abort(_("cannot uncommit while merging"))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1661 old = repo['.']
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1662 if old.phase() == phases.public:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1663 raise util.Abort(_("cannot rewrite immutable changeset"))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1664 if len(old.parents()) > 1:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1665 raise util.Abort(_("cannot uncommit merge changeset"))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1666 oldphase = old.phase()
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	1667 updatebookmarks = _bookmarksupdater(repo, old.node())
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1668 # Recommit the filtered changeset
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1669 newid = None
314 ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	1670 if (pats or opts.get('include') or opts.get('exclude')
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	1671 or opts.get('all')):
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1672 match = scmutil.match(old, pats, opts)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1673 newid = _commitfiltered(repo, old, match)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1674 if newid is None:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1675 raise util.Abort(_('nothing to uncommit'))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1676 # Move local changes on filtered changeset
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1677 createmarkers(repo, [(old, (repo[newid],))])
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1678 phases.retractboundary(repo, oldphase, [newid])
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1679 repo.dirstate.setparents(newid, node.nullid)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1680 _uncommitdirstate(repo, old, match)
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	1681 updatebookmarks(newid)
318 da7509e7b50c evolve: warn when uncommit leave an empty changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 315 diff changeset	1682 if not repo[newid].files():
da7509e7b50c evolve: warn when uncommit leave an empty changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 315 diff changeset	1683 ui.warn(_("new changeset is empty\n"))
925 89b50258ad33 uncommit: change 'kill' to 'prune' in error message Faheem Mitha <faheem@faheem.info> parents: 923 diff changeset	1684 ui.status(_('(use "hg prune ." to remove it)\n'))
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1685 finally:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1686 wlock.release()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1687 finally:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1688 lock.release()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	1689
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1690 @eh.wrapcommand('commit')
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	1691 def commitwrapper(orig, ui, repo, arg, *kwargs):
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1692 if kwargs.get('amend', False):
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1693 lock = None
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1694 else:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1695 lock = repo.lock()
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1696 try:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1697 obsoleted = kwargs.get('obsolete', [])
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1698 if obsoleted:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1699 obsoleted = repo.set('%lr', obsoleted)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1700 result = orig(ui, repo, arg, *kwargs)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1701 if not result: # commit successed
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1702 new = repo['-1']
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1703 oldbookmarks = []
444 aedb6b8ace86 drop repo.addobsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	1704 markers = []
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1705 for old in obsoleted:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1706 oldbookmarks.extend(repo.nodebookmarks(old.node()))
444 aedb6b8ace86 drop repo.addobsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	1707 markers.append((old, (new,)))
aedb6b8ace86 drop repo.addobsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	1708 if markers:
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1709 createmarkers(repo, markers)
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1710 for book in oldbookmarks:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1711 repo._bookmarks[book] = new.node()
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1712 if oldbookmarks:
612 15299bfd0813 adapt to 7f5dab94e48c in crew Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 604 diff changeset	1713 repo._bookmarks.write()
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1714 return result
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	1715 finally:
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1716 if lock is not None:
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1717 lock.release()
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	1718
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1719 @command('^touch',
701 f752089479ce add a duplicate option in touch Denis Laxalde <denis.laxalde@logilab.fr> parents: 699 diff changeset	1720 [('r', 'rev', [], 'revision to update'),
f752089479ce add a duplicate option in touch Denis Laxalde <denis.laxalde@logilab.fr> parents: 699 diff changeset	1721 ('D', 'duplicate', False,
f752089479ce add a duplicate option in touch Denis Laxalde <denis.laxalde@logilab.fr> parents: 699 diff changeset	1722 'do not mark the new revision as successor of the old one')],
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1723 # allow to choose the seed ?
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1724 _('[-r] revs'))
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1725 def touch(ui, repo, revs, *opts):
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	1726 """Create successors that are identical to their predecessors except for the changeset ID
517 0bc0c9edcb15 evolve: usual syntax/grammar errors/long lines cleanup Patrick Mezard <patrick@mezard.eu> parents: 516 diff changeset	1727
0bc0c9edcb15 evolve: usual syntax/grammar errors/long lines cleanup Patrick Mezard <patrick@mezard.eu> parents: 516 diff changeset	1728 This is used to "resurrect" changesets
0bc0c9edcb15 evolve: usual syntax/grammar errors/long lines cleanup Patrick Mezard <patrick@mezard.eu> parents: 516 diff changeset	1729 """
701 f752089479ce add a duplicate option in touch Denis Laxalde <denis.laxalde@logilab.fr> parents: 699 diff changeset	1730 duplicate = opts['duplicate']
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1731 revs = list(revs)
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1732 revs.extend(opts['rev'])
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1733 if not revs:
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1734 revs = ['.']
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1735 revs = scmutil.revrange(repo, revs)
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1736 if not revs:
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1737 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	1738 return 1
701 f752089479ce add a duplicate option in touch Denis Laxalde <denis.laxalde@logilab.fr> parents: 699 diff changeset	1739 if not duplicate and repo.revs('public() and %ld', revs):
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1740 raise util.Abort("can't touch public revision")
514 ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1741 wlock = lock = None
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1742 try:
514 ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1743 wlock = repo.wlock()
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1744 lock = repo.lock()
514 ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1745 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	1746 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	1747 newmapping = {}
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1748 try:
514 ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1749 for r in revs:
ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1750 ctx = repo[r]
ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1751 extra = ctx.extra().copy()
ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1752 extra['__touch-noise__'] = random.randint(0, 0xffffffff)
702 b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1753 # search for touched parent
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1754 p1 = ctx.p1().node()
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1755 p2 = ctx.p2().node()
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1756 p1 = newmapping.get(p1, p1)
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1757 p2 = newmapping.get(p2, p2)
514 ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1758 new, _ = rewrite(repo, ctx, [], ctx,
702 b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1759 [p1, p2],
514 ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1760 commitopts={'extra': extra})
702 b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1761 # store touched version to help potential children
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1762 newmapping[ctx.node()] = new
701 f752089479ce add a duplicate option in touch Denis Laxalde <denis.laxalde@logilab.fr> parents: 699 diff changeset	1763 if not duplicate:
f752089479ce add a duplicate option in touch Denis Laxalde <denis.laxalde@logilab.fr> parents: 699 diff changeset	1764 createmarkers(repo, [(ctx, (repo[new],))])
514 ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1765 phases.retractboundary(repo, ctx.phase(), [new])
ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1766 if ctx in repo[None].parents():
ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1767 repo.dirstate.setparents(new, node.nullid)
ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1768 tr.close()
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1769 finally:
514 ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1770 tr.release()
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1771 finally:
514 ea667749ccd1 touch: simplify locking pattern Patrick Mezard <patrick@mezard.eu> parents: 513 diff changeset	1772 lockmod.release(lock, wlock)
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1773
934 f13facb01ac5 fold: add squash as a possible alias Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 933 diff changeset	1774 @command('^fold\|squash',
702 b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1775 [('r', 'rev', [], _("explicitly specify the full set of revision to fold")),
933 e5baeb8fefec fold: add --message and --logfile options Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	1776 ] + commitopts + commitopts2,
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1777 # allow to choose the seed ?
702 b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1778 _('rev'))
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1779 def fold(ui, repo, revs, *opts):
702 b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1780 """Fold multiple revisions into a single one
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1781
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	1782 The revisions from your current working directory to the given one are folded
36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	1783 into a single successor revision.
702 b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1784
891 36c1c80e99a3 commands: small language fixes in help Brendan Cully <brendan@kublai.com> parents: 867 diff changeset	1785 you can alternatively use --rev to explicitly specify revisions to be folded,
702 b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1786 ignoring the current working directory parent.
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1787 """
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1788 revs = list(revs)
561 897f6da2314e fold: handle the lack of revision to fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 554 diff changeset	1789 if revs:
702 b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1790 if opts.get('rev', ()):
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1791 raise util.Abort("cannot specify both --rev and a target revision")
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1792 targets = scmutil.revrange(repo, revs)
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1793 revs = repo.revs('(%ld::.) or (.::%ld)', targets, targets)
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1794 elif 'rev' in opts:
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1795 revs = scmutil.revrange(repo, opts['rev'])
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1796 else:
b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 701 diff changeset	1797 revs = ()
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1798 if not revs:
d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1799 ui.write_err('no revision to fold\n')
d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1800 return 1
d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1801 roots = repo.revs('roots(%ld)', revs)
d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1802 if len(roots) > 1:
517 0bc0c9edcb15 evolve: usual syntax/grammar errors/long lines cleanup Patrick Mezard <patrick@mezard.eu> parents: 516 diff changeset	1803 raise util.Abort("set has multiple roots")
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1804 root = repo[roots[0]]
d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1805 if root.phase() <= phases.public:
517 0bc0c9edcb15 evolve: usual syntax/grammar errors/long lines cleanup Patrick Mezard <patrick@mezard.eu> parents: 516 diff changeset	1806 raise util.Abort("can't fold public revisions")
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1807 heads = repo.revs('heads(%ld)', revs)
d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1808 if len(heads) > 1:
517 0bc0c9edcb15 evolve: usual syntax/grammar errors/long lines cleanup Patrick Mezard <patrick@mezard.eu> parents: 516 diff changeset	1809 raise util.Abort("set has multiple heads")
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1810 head = repo[heads[0]]
515 0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	1811 wlock = lock = None
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1812 try:
515 0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	1813 wlock = repo.wlock()
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1814 lock = repo.lock()
515 0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	1815 tr = repo.transaction('touch')
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1816 try:
915 1ebe5c51919b fold: enable --date and --user options Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 912 diff changeset	1817 commitopts = opts.copy()
515 0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	1818 allctx = [repo[r] for r in revs]
0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	1819 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	1820
e5baeb8fefec fold: add --message and --logfile options Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	1821 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	1822 commitopts['edit'] = False
e5baeb8fefec fold: add --message and --logfile options Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	1823 else:
e5baeb8fefec fold: add --message and --logfile options Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	1824 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	1825 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	1826 (c.rev(), c.description()) for c in allctx]
e5baeb8fefec fold: add --message and --logfile options Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	1827 commitopts['message'] = "\n".join(msgs)
e5baeb8fefec fold: add --message and --logfile options Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	1828 commitopts['edit'] = True
e5baeb8fefec fold: add --message and --logfile options Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 931 diff changeset	1829
515 0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	1830 newid, _ = rewrite(repo, root, allctx, head,
0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	1831 [root.p1().node(), root.p2().node()],
619 f50f8da7a077 add a -e option to fold Denis Laxalde <denis.laxalde@logilab.fr> parents: 611 diff changeset	1832 commitopts=commitopts)
515 0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	1833 phases.retractboundary(repo, targetphase, [newid])
0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	1834 createmarkers(repo, [(ctx, (repo[newid],))
0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	1835 for ctx in allctx])
0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	1836 tr.close()
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1837 finally:
515 0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	1838 tr.release()
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1839 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	1840 if repo['.'].rev() in revs:
549 b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 548 diff changeset	1841 hg.update(repo, newid)
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1842 finally:
515 0b60c28d9c43 fold: simplify locking Patrick Mezard <patrick@mezard.eu> parents: 514 diff changeset	1843 lockmod.release(lock, wlock)
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	1844
587 8152fedbac65 evolve: smarter code for divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 586 diff changeset	1845
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	1846
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1847 @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	1848 def graftwrapper(orig, ui, repo, revs, *kwargs):
419 03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 410 diff changeset	1849 kwargs = dict(kwargs)
03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 410 diff changeset	1850 revs = list(revs) + kwargs.get('rev', [])
03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 410 diff changeset	1851 kwargs['rev'] = []
417 a1fb18ad29a1 evolve: avoid duplication in graft wrapper Patrick Mezard <patrick@mezard.eu> parents: 416 diff changeset	1852 obsoleted = kwargs.setdefault('obsolete', [])
419 03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 410 diff changeset	1853
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	1854 lock = repo.lock()
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	1855 try:
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	1856 if kwargs.get('old_obsolete'):
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 417 diff changeset	1857 if kwargs.get('continue'):
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	1858 obsoleted.extend(repo.opener.read('graftstate').splitlines())
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	1859 else:
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	1860 obsoleted.extend(revs)
151 e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	1861 # 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	1862 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	1863 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	1864
743 af74a5cdf96b conform to the Mercurial custom of lowercase messages Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 742 diff changeset	1865 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	1866 'obsoleting (for now).'))
e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	1867
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	1868 return commitwrapper(orig, ui, repo,revs, *kwargs)
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	1869 finally:
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	1870 lock.release()
117 438fe133b068 Add a -o and -O option to graft. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 116 diff changeset	1871
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1872 @eh.extsetup
6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1873 def oldevolveextsetup(ui):
211 69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	1874 try:
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	1875 rebase = extensions.find('rebase')
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	1876 except KeyError:
416 22f348c25d25 obsolete/evolve: fix grammar in prerequisite messages Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	1877 raise error.Abort(_('evolution extension requires rebase extension.'))
211 69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	1878
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 741 diff changeset	1879 for cmd in ['kill', 'uncommit', 'touch', 'fold']:
356 56d4c6207ef9 Move obserror warning into the obsolete extension. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 355 diff changeset	1880 entry = extensions.wrapcommand(cmdtable, cmd,
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1881 warnobserrors)
356 56d4c6207ef9 Move obserror warning into the obsolete extension. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 355 diff changeset	1882
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1883 entry = cmdutil.findcmd('commit', commands.table)[1]
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	1884 entry[1].append(('o', 'obsolete', [],
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	1885 _("make commit obsolete this revision")))
491 6989d8fe4ed2 merge evolve and obsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 490 diff changeset	1886 entry = cmdutil.findcmd('graft', commands.table)[1]
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	1887 entry[1].append(('o', 'obsolete', [],
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	1888 _("make graft obsoletes this revision")))
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	1889 entry[1].append(('O', 'old-obsolete', False,
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	1890 _("make graft obsoletes its source")))
211 69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	1891

Mercurial > public > mercurial-scm > evolve

annotate hgext/evolve.py @ 934:f13facb01ac5 stable