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

annotate hgext/evolve.py @ 355:72642a6970e0 stable

evolve: warn on conflicting changeset too

author	Pierre-Yves David <pierre-yves.david@logilab.fr>
date	Wed, 11 Jul 2012 13:38:48 +0200
parents	52c53e2d413b
children	56d4c6207ef9

rev	line source
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1 # states.py - introduce the state concept for mercurial changeset
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	2 #
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	3 # Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	4 # Logilab SA <contact@logilab.fr>
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	5 # Pierre-Yves David <pierre-yves.david@ens-lyon.org>
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	6 #
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	7 # 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	8 # 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	9
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 219 diff changeset	10 '''a set of commands to handle changeset mutation'''
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	11
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	12 from mercurial import cmdutil
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	13 from mercurial import scmutil
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	14 from mercurial import node
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	15 from mercurial import error
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	16 from mercurial import extensions
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	17 from mercurial import commands
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	18 from mercurial import bookmarks
113 3bdabdbb4140 adapt evolution to phase in core. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 108 diff changeset	19 from mercurial import phases
219 cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	20 from mercurial import commands
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	21 from mercurial import context
219 cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	22 from mercurial import copies
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	23 from mercurial import util
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	24 from mercurial.i18n import _
178 3f18a6580d14 evolve: logopts was called logopt. Arne Babenhauserheide <bab@draketo.de> parents: 151 diff changeset	25 from mercurial.commands import walkopts, commitopts, commitopts2, logopts
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	26 from mercurial import hg
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	27
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	28 ### util function
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	29 #############################
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	30
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	31 def noderange(repo, revsets):
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	32 """The same as revrange but return node"""
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	33 return map(repo.changelog.node,
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	34 scmutil.revrange(repo, revsets))
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	35
309 de21685d22d1 evolve: warn when latecomer changeset are created Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 303 diff changeset	36 def warnobserrors(orig, ui, repo, args, *kwargs):
211 69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	37 """display warning is the command resulted in more instable changeset"""
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	38 priorunstables = len(repo.revs('unstable()'))
309 de21685d22d1 evolve: warn when latecomer changeset are created Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 303 diff changeset	39 priorlatecomers = len(repo.revs('latecomer()'))
355 72642a6970e0 evolve: warn on conflicting changeset too Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 326 diff changeset	40 priorconflictings = len(repo.revs('conflicting()'))
211 69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	41 #print orig, priorunstables
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	42 #print len(repo.revs('secret() - obsolete()'))
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	43 try:
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	44 return orig(ui, repo, args, *kwargs)
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	45 finally:
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	46 newunstables = len(repo.revs('unstable()')) - priorunstables
309 de21685d22d1 evolve: warn when latecomer changeset are created Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 303 diff changeset	47 newlatecomers = len(repo.revs('latecomer()')) - priorlatecomers
355 72642a6970e0 evolve: warn on conflicting changeset too Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 326 diff changeset	48 newconflictings = len(repo.revs('conflicting()')) - priorconflictings
211 69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	49 #print orig, newunstables
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	50 #print len(repo.revs('secret() - obsolete()'))
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	51 if newunstables > 0:
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	52 ui.warn(_('%i new unstables changesets\n') % newunstables)
309 de21685d22d1 evolve: warn when latecomer changeset are created Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 303 diff changeset	53 if newlatecomers > 0:
de21685d22d1 evolve: warn when latecomer changeset are created Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 303 diff changeset	54 ui.warn(_('%i new latecomers changesets\n') % newlatecomers)
355 72642a6970e0 evolve: warn on conflicting changeset too Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 326 diff changeset	55 if newconflictings > 0:
72642a6970e0 evolve: warn on conflicting changeset too Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 326 diff changeset	56 ui.warn(_('%i new conflictings changesets\n') % newconflictings)
211 69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	57
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	58 ### changeset rewriting logic
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	59 #############################
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	60
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	61 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	62 """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	63 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	64 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	65 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	66 """
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	67 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	68 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	69 base = old.p1()
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	70 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	71
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	72 wlock = repo.wlock()
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	73 try:
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	74
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	75 # 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	76 # 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	77 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	78 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	79 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	80
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	81 # 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	82 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	83
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	84
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	85 # 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	86 def samefile(f):
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	87 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	88 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	89 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	90 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	91 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	92 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	93 else:
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	94 return False
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	95 else:
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	96 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	97 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	98 # 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	99 headmf = head.manifest()
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	100 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	101 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	102 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	103 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	104 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	105 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	106 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	107 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	108 return mctx
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	109 raise IOError()
104 6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	110 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	111 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	112 ' exclusive'))
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	113 if commitopts.get('logfile'):
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	114 message= open(commitopts['logfile']).read()
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	115 elif commitopts.get('message'):
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	116 message = commitopts['message']
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	117 else:
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	118 message = old.description()
6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	119
142 c2f7a8530e51 overwrite user not date Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 141 diff changeset	120 user = commitopts.get('user') or old.user()
c2f7a8530e51 overwrite user not date Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 141 diff changeset	121 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	122 extra = dict(commitopts.get('extra', {}))
de62daaf2054 amend: drop --branches, pick it from working directory Patrick Mezard <patrick@mezard.eu> parents: 260 diff changeset	123 extra['branch'] = head.branch()
118 06fe05256a79 edit option \o/ Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 117 diff changeset	124
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	125 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	126 parents=newbases,
104 6c3c7a18f079 propertly handle -m and -l option Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 103 diff changeset	127 text=message,
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	128 files=files,
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	129 filectxfn=filectxfn,
142 c2f7a8530e51 overwrite user not date Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 141 diff changeset	130 user=user,
c2f7a8530e51 overwrite user not date Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 141 diff changeset	131 date=date,
263 de62daaf2054 amend: drop --branches, pick it from working directory Patrick Mezard <patrick@mezard.eu> parents: 260 diff changeset	132 extra=extra)
118 06fe05256a79 edit option \o/ Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 117 diff changeset	133
06fe05256a79 edit option \o/ Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 117 diff changeset	134 if commitopts.get('edit'):
06fe05256a79 edit option \o/ Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 117 diff changeset	135 new._text = cmdutil.commitforceeditor(repo, new, [])
265 24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	136 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	137 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	138 new = repo[newid]
265 24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	139 created = len(repo) != revcount
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	140 if created:
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	141 updatebookmarks(newid)
265 24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	142 # add evolution metadata
298 f597421662f7 obsolete: unify collapsed revisions markers handling Patrick Mezard <patrick@mezard.eu> parents: 295 diff changeset	143 collapsed = set([u.node() for u in updates] + [old.node()])
f597421662f7 obsolete: unify collapsed revisions markers handling Patrick Mezard <patrick@mezard.eu> parents: 295 diff changeset	144 repo.addcollapsedobsolete(collapsed, new.node())
265 24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	145 else:
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	146 # newid is an existing revision. It could make sense to
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	147 # replace revisions with existing ones but probably not by
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	148 # default.
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	149 pass
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	150 finally:
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	151 wlock.release()
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	152
265 24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	153 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	154
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	155 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	156 """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	157 try:
64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	158 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	159 # dummy state to trick rebase node
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	160 assert orig.p2().rev() == node.nullrev, 'no support yet'
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	161 destbookmarks = repo.nodebookmarks(dest.node())
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	162 cmdutil.duplicatecopies(repo, orig.node(), 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	163 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	164 destphase = repo[nodesrc].phase()
255 9852b3ef7234 evolve: update rebase usage to match 2.3 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 232 diff changeset	165 if rebase.rebasenode.func_code.co_argcount == 5:
9852b3ef7234 evolve: update rebase usage to match 2.3 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 232 diff changeset	166 # rebasenode collapse argument was introduced by
9852b3ef7234 evolve: update rebase usage to match 2.3 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 232 diff changeset	167 # d1afbf03e69a (2.3)
9852b3ef7234 evolve: update rebase usage to match 2.3 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 232 diff changeset	168 rebase.rebasenode(repo, orig.node(), dest.node(),
9852b3ef7234 evolve: update rebase usage to match 2.3 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 232 diff changeset	169 {node.nullrev: node.nullrev}, False)
9852b3ef7234 evolve: update rebase usage to match 2.3 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 232 diff changeset	170 else:
9852b3ef7234 evolve: update rebase usage to match 2.3 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 232 diff changeset	171 rebase.rebasenode(repo, orig.node(), dest.node(),
9852b3ef7234 evolve: update rebase usage to match 2.3 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 232 diff changeset	172 {node.nullrev: node.nullrev})
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	173 try:
52c53e2d413b stabilize: clear error message than conflict during rebase offer no hope Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 319 diff changeset	174 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	175 node.nullid)
52c53e2d413b stabilize: clear error message than conflict during rebase offer no hope Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 319 diff changeset	176 except util.Abort:
52c53e2d413b stabilize: clear error message than conflict during rebase offer no hope Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 319 diff changeset	177 repo.ui.write_err(_('/!\\ stabilize failed /!\\\n'))
52c53e2d413b stabilize: clear error message than conflict during rebase offer no hope Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 319 diff changeset	178 repo.ui.write_err(_('/!\\ Their is no "hg stabilize --continue" /!\\\n'))
52c53e2d413b stabilize: clear error message than conflict during rebase offer no hope Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 319 diff changeset	179 repo.ui.write_err(_('/!\\ use "hg up -C . ; hg stabilize --dry-run" /!\\\n'))
52c53e2d413b stabilize: clear error message than conflict during rebase offer no hope Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 319 diff changeset	180 raise
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	181 oldbookmarks = repo.nodebookmarks(nodesrc)
284 88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	182 if nodenew is not None:
88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	183 phases.retractboundary(repo, destphase, [nodenew])
88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	184 repo.addobsolete(nodenew, nodesrc)
88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	185 for book in oldbookmarks:
88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	186 repo._bookmarks[book] = nodenew
88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	187 else:
88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	188 repo.addobsolete(node.nullid, nodesrc)
88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	189 # Behave like rebase, move bookmarks to dest
88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	190 for book in oldbookmarks:
88a851a54f26 evolve: fix relocate() with removed revision Patrick Mezard <patrick@mezard.eu> parents: 272 diff changeset	191 repo._bookmarks[book] = dest.node()
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	192 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	193 repo._bookmarks[book] = dest.node()
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	194 if oldbookmarks or destbookmarks:
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	195 bookmarks.write(repo)
64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	196 except util.Abort:
64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	197 # 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	198 repo.dirstate.invalidate()
64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	199 raise
64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	200
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	201 def stabilizableunstable(repo, pctx):
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	202 """Return a changectx for an unstable changeset which can be
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	203 stabilized on top of pctx or one of its descendants. None if none
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	204 can be found.
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	205 """
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	206 def selfanddescendants(repo, pctx):
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	207 yield pctx
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	208 for ctx in pctx.descendants():
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	209 yield ctx
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	210
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	211 # Look for an unstable which can be stabilized as a child of
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	212 # node. The unstable must be a child of one of node predecessors.
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	213 for ctx in selfanddescendants(repo, pctx):
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	214 unstables = list(repo.set('unstable() and children(obsancestors(%d))',
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	215 ctx.rev()))
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	216 if unstables:
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	217 return unstables[0]
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	218 return None
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	219
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	220 def _bookmarksupdater(repo, oldid):
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	221 """Return a callable update(newid) updating the current bookmark
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	222 and bookmarks bound to oldid to newid.
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	223 """
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	224 bm = bookmarks.readcurrent(repo)
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	225 def updatebookmarks(newid):
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	226 dirty = False
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	227 if bm:
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	228 repo._bookmarks[bm] = newid
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	229 dirty = True
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	230 oldbookmarks = repo.nodebookmarks(oldid)
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	231 if oldbookmarks:
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	232 for b in oldbookmarks:
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	233 repo._bookmarks[b] = newid
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	234 dirty = True
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	235 if dirty:
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	236 bookmarks.write(repo)
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	237 return updatebookmarks
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	238
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	239 ### new command
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	240 #############################
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	241 cmdtable = {}
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	242 command = cmdutil.command(cmdtable)
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	243
272 78d01e341438 evolve: add alias for kill and stabilize Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 269 diff changeset	244 @command('^stabilize\|evolve',
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	245 [('n', 'dry-run', False, 'do not perform actions, print what to be done'),
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	246 ('A', 'any', False, 'stabilize any unstable changeset'),],
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	247 _('[OPTIONS]...'))
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	248 def stabilize(ui, repo, **opts):
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	249 """rebase an unstable changeset to make it stable again
145 928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	250
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	251 By default, take the first unstable changeset which could be
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	252 rebased as child of the working directory parent revision or one
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	253 of its descendants and rebase it.
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	254
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	255 With --any, stabilize any unstable changeset.
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	256
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	257 The working directory is updated to the rebased revision.
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	258 """
145 928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	259
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	260 obsolete = extensions.find('obsolete')
145 928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	261
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	262 node = None
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	263 if not opts['any']:
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	264 node = stabilizableunstable(repo, repo['.'])
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	265 if node is None:
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	266 unstables = list(repo.set('unstable()'))
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	267 if unstables and not opts['any']:
145 928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	268 ui.write_err(_('nothing to stabilize here\n'))
928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	269 ui.status(_('(%i unstable changesets, do you want --any ?)\n')
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	270 % len(unstables))
145 928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	271 return 2
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	272 elif not unstables:
145 928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	273 ui.write_err(_('no unstable changeset\n'))
928f217c1701 stabilize: stabilize my topological branch only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 142 diff changeset	274 return 1
269 6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	275 node = unstables[0]
6c6bb7a23bb5 stabilize: improve unstable selection heuristic Patrick Mezard <patrick@mezard.eu> parents: 268 diff changeset	276
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	277 obs = node.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	278 if not obs.obsolete():
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	279 obs = node.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	280 assert obs.obsolete()
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	281 newer = obsolete.newerversion(repo, obs.node())
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	282 if len(newer) > 1:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	283 ui.write_err(_("conflict rewriting. can't choose destination\n"))
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	284 return 2
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	285 targets = newer[0]
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	286 if not targets:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	287 ui.write_err(_("does not handle kill parent yet\n"))
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	288 return 2
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	289 if len(targets) > 1:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	290 ui.write_err(_("does not handle splitted parent yet\n"))
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	291 return 2
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	292 target = targets[0]
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	293 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	294 target = repo[target]
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	295 repo.ui.status(_('move:'))
146 e80a6c8ad452 stabilize: proper --quiet behavior Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 145 diff changeset	296 if not ui.quiet:
e80a6c8ad452 stabilize: proper --quiet behavior Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 145 diff changeset	297 displayer.show(node)
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	298 repo.ui.status(_('atop:'))
146 e80a6c8ad452 stabilize: proper --quiet behavior Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 145 diff changeset	299 if not ui.quiet:
e80a6c8ad452 stabilize: proper --quiet behavior Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 145 diff changeset	300 displayer.show(target)
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	301 todo= 'hg rebase -Dr %s -d %s\n' % (node, target)
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	302 if opts['dry_run']:
146 e80a6c8ad452 stabilize: proper --quiet behavior Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 145 diff changeset	303 repo.ui.write(todo)
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	304 else:
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	305 repo.ui.note(todo)
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	306 lock = repo.lock()
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	307 try:
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	308 relocate(repo, node, target)
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	309 finally:
9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 137 diff changeset	310 lock.release()
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	311
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	312 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	313
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	314 @command('^gdown',
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	315 [],
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	316 '')
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	317 def cmdgdown(ui, repo):
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	318 """update to parent an 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	319 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	320 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	321 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	322 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	323
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	324 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	325 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	326 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	327 p = parents[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	328 hg.update(repo, p.rev())
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	329 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	330 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	331 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	332 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	333 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	334 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	335 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	336
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	337 @command('^gup',
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	338 [],
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	339 '')
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	340 def cmdup(ui, repo):
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	341 """update to child an 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	342 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	343 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	344 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	345 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	346
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	347 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	348 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	349 if not 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	350 ui.warn(_('No non-obsolete children\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	351 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	352 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	353 c = children[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	354 hg.update(repo, c.rev())
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	355 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	356 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	357 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	358 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	359 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	360 ui.warn(_('Multiple non-obsolete children, 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	361 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	362
319 e7431cf7fca9 evolve: add a prune alias for kill Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 318 diff changeset	363 @command('^kill\|obsolete\|prune',
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	364 [('n', 'new', [], _("successor changeset"))],
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	365 _('[OPTION] REV...'))
130 b70fadbccc2a evolution: add a --new argument for kill Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 127 diff changeset	366 def kill(ui, repo, revs, *opts):
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	367 """mark a changeset as obsolete
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	368
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	369 This update the parent directory to a not-killed parent if the current
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	370 working directory parent are killed.
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	371
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	372 XXX bookmark support
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	373 XXX handle merge
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	374 XXX check immutable first
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	375 """
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	376 wlock = repo.wlock()
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	377 try:
147 b0b23d9eede5 kill: properly get revision pointed by --new Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 146 diff changeset	378 new = set(noderange(repo, opts['new']))
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	379 targetnodes = set(noderange(repo, revs))
130 b70fadbccc2a evolution: add a --new argument for kill Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 127 diff changeset	380 if not new:
b70fadbccc2a evolution: add a --new argument for kill Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 127 diff changeset	381 new = [node.nullid]
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	382 for n in targetnodes:
130 b70fadbccc2a evolution: add a --new argument for kill Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 127 diff changeset	383 if not repo[n].mutable():
b70fadbccc2a evolution: add a --new argument for kill Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 127 diff changeset	384 ui.warn(_("Can't kill immutable changeset %s") % repo[n])
b70fadbccc2a evolution: add a --new argument for kill Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 127 diff changeset	385 else:
b70fadbccc2a evolution: add a --new argument for kill Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 127 diff changeset	386 for ne in new:
b70fadbccc2a evolution: add a --new argument for kill Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 127 diff changeset	387 repo.addobsolete(ne, n)
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	388 # update to an unkilled parent
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	389 wdp = repo['.']
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	390 newnode = wdp
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	391 while newnode.obsolete():
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	392 newnode = newnode.parents()[0]
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	393 if newnode.node() != wdp.node():
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	394 commands.update(ui, repo, newnode.rev())
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	395 ui.status(_('working directory now at %s\n') % newnode)
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	396
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	397 finally:
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	398 wlock.release()
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	399
151 e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	400 @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	401 [('A', 'addremove', None,
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	402 _('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	403 ('n', 'note', '', _('use text as commit message for this update')),
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	404 ('c', 'change', '', _('specifies the changesets to amend'), _('REV')),
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	405 ('e', 'edit', False, _('invoke editor on commit messages')),
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	406 ] + walkopts + commitopts + commitopts2,
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	407 _('[OPTION]... [FILE]...'))
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	408 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	409 """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	410
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	411 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	412 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	413
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	414 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	415
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	416 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	417
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	418 If you specify --change, amend additionally considers all
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	419 changesets between the indicated changeset and the working copy
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	420 parent as updates to be subsumed.
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	421
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	422 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	423 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	424 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	425 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	426 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	427
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	428 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	429 """
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	430
8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	431 # determine updates to subsume
295 a5894bb97909 evolve: remove --change . == --change .^ crazyness Patrick Mezard <patrick@mezard.eu> parents: 294 diff changeset	432 old = scmutil.revsingle(repo, opts.get('change') or '.')
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	433
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	434 lock = repo.lock()
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	435 try:
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	436 wlock = repo.wlock()
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	437 try:
294 98c9c69c311d evolve: use explicit phase constants Patrick Mezard <patrick@mezard.eu> parents: 284 diff changeset	438 if old.phase() == phases.public:
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	439 raise util.Abort(_("can not rewrite immutable changeset %s")
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	440 % old)
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	441 oldphase = old.phase()
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	442 # commit current changes as update
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	443 # code copied from commands.commit to avoid noisy messages
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	444 ciopts = dict(opts)
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	445 ciopts.pop('message', None)
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	446 ciopts.pop('logfile', None)
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	447 ciopts['message'] = opts.get('note') or ('amends %s' % old.hex())
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	448 e = cmdutil.commiteditor
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	449 def commitfunc(ui, repo, message, match, opts):
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	450 return repo.commit(message, opts.get('user'), opts.get('date'),
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	451 match, editor=e)
265 24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	452 revcount = len(repo)
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	453 tempid = cmdutil.commit(ui, repo, commitfunc, pats, ciopts)
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	454 if len(repo) == revcount:
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	455 # No revision created
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	456 tempid = None
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	457
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	458 # find all changesets to be considered updates
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	459 head = repo['.']
268 2da5af3dadeb amend: remove useless repo.changelog alias Patrick Mezard <patrick@mezard.eu> parents: 265 diff changeset	460 updatenodes = set(repo.changelog.nodesbetween(
2da5af3dadeb amend: remove useless repo.changelog alias Patrick Mezard <patrick@mezard.eu> parents: 265 diff changeset	461 roots=[old.node()], heads=[head.node()])[0])
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	462 updatenodes.remove(old.node())
263 de62daaf2054 amend: drop --branches, pick it from working directory Patrick Mezard <patrick@mezard.eu> parents: 260 diff changeset	463 okoptions = ['message', 'logfile', 'edit', 'user']
140 462d52ae7fb7 add user to the list of option prevent the "no change found" message to show up Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 139 diff changeset	464 if not updatenodes:
462d52ae7fb7 add user to the list of option prevent the "no change found" message to show up Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 139 diff changeset	465 for o in okoptions:
462d52ae7fb7 add user to the list of option prevent the "no change found" message to show up Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 139 diff changeset	466 if opts.get(o):
462d52ae7fb7 add user to the list of option prevent the "no change found" message to show up Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 139 diff changeset	467 break
462d52ae7fb7 add user to the list of option prevent the "no change found" message to show up Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 139 diff changeset	468 else:
462d52ae7fb7 add user to the list of option prevent the "no change found" message to show up Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 139 diff changeset	469 raise error.Abort(_('no updates found'))
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	470 updates = [repo[n] for n in updatenodes]
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	471
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	472 # perform amend
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	473 if opts.get('edit'):
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	474 opts['force_editor'] = True
265 24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	475 newid, created = rewrite(repo, old, updates, head,
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	476 [old.p1().node(), old.p2().node()], opts)
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	477 if created:
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	478 # reroute the working copy parent to the new changeset
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	479 phases.retractboundary(repo, oldphase, [newid])
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	480 repo.dirstate.setparents(newid, node.nullid)
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	481 else:
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	482 # rewrite() recreated an existing revision, discard
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	483 # the intermediate revision if any. No need to update
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	484 # phases or parents.
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	485 if tempid is not None:
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	486 repo.addobsolete(node.nullid, tempid)
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	487 # XXX: need another message in collapse case.
24943df310d4 amend: do not traceback on no-ops Patrick Mezard <patrick@mezard.eu> parents: 264 diff changeset	488 raise error.Abort(_('no updates found'))
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	489 finally:
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	490 wlock.release()
82 8108d566a8b5 [evolution]?imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	491 finally:
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	492 lock.release()
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	493
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	494 def _commitfiltered(repo, ctx, match):
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	495 """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	496 node identifier, or None if nothing changed.
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	497 """
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	498 base = ctx.p1()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	499 m, a, r = repo.status(base, ctx)[:3]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	500 allfiles = set(m + a + r)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	501 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	502 if files == allfiles:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	503 return None
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	504
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	505 # Filter copies
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	506 copied = copies.pathcopies(base, ctx)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	507 copied = dict((src, dst) for src, dst in copied.iteritems()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	508 if dst in files)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	509 def filectxfn(repo, memctx, path):
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	510 if path not in ctx:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	511 raise IOError()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	512 fctx = ctx[path]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	513 flags = fctx.flags()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	514 mctx = context.memfilectx(fctx.path(), fctx.data(),
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	515 islink='l' in flags,
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	516 isexec='x' in flags,
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	517 copied=copied.get(path))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	518 return mctx
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	519
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	520 new = context.memctx(repo,
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	521 parents=[base.node(), node.nullid],
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	522 text=ctx.description(),
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	523 files=files,
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	524 filectxfn=filectxfn,
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	525 user=ctx.user(),
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	526 date=ctx.date(),
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	527 extra=ctx.extra())
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	528 # commitctx always create a new revision, no need to check
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	529 newid = repo.commitctx(new)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	530 return newid
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	531
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	532 def _uncommitdirstate(repo, oldctx, match):
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	533 """Fix the dirstate after switching the working directory from
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	534 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	535 match.
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	536 """
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	537 ctx = repo['.']
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	538 ds = repo.dirstate
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	539 copies = dict(ds.copies())
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	540 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	541 for f in m:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	542 if ds[f] == 'r':
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	543 # modified + removed -> removed
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	544 continue
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	545 ds.normallookup(f)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	546
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	547 for f in a:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	548 if ds[f] == 'r':
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	549 # added + removed -> unknown
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	550 ds.drop(f)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	551 elif ds[f] != 'a':
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	552 ds.add(f)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	553
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	554 for f in r:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	555 if ds[f] == 'a':
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	556 # removed + added -> normal
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	557 ds.normallookup(f)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	558 elif ds[f] != 'r':
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	559 ds.remove(f)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	560
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	561 # Merge old parent and old working dir copies
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	562 oldcopies = {}
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	563 for f in (m + a):
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	564 src = oldctx[f].renamed()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	565 if src:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	566 oldcopies[f] = src[0]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	567 oldcopies.update(copies)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	568 copies = dict((dst, oldcopies.get(src, src))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	569 for dst, src in oldcopies.iteritems())
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	570 # Adjust the dirstate copies
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	571 for dst, src in copies.iteritems():
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	572 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	573 src = None
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	574 ds.copy(src, dst)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	575
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	576 @command('^uncommit',
314 ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	577 [('a', 'all', None, _('uncommit all changes when no arguments given')),
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	578 ] + commands.walkopts,
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	579 _('[OPTION]... [NAME]'))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	580 def uncommit(ui, repo, pats, *opts):
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	581 """move changes from parent revision to working directory
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	582
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	583 Changes to selected files in parent revision appear again as
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	584 uncommitted changed in the working directory. A new revision
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	585 without selected changes is created, becomes the new parent and
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	586 obsoletes the previous one.
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	587
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	588 The --include option specify pattern to uncommit
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	589 The --exclude option specify pattern to keep in the commit
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	590
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	591 Return 0 if changed files are uncommitted.
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	592 """
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	593 lock = repo.lock()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	594 try:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	595 wlock = repo.wlock()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	596 try:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	597 wctx = repo[None]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	598 if len(wctx.parents()) <= 0:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	599 raise util.Abort(_("cannot uncommit null changeset"))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	600 if len(wctx.parents()) > 1:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	601 raise util.Abort(_("cannot uncommit while merging"))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	602 old = repo['.']
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	603 if old.phase() == phases.public:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	604 raise util.Abort(_("cannot rewrite immutable changeset"))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	605 if len(old.parents()) > 1:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	606 raise util.Abort(_("cannot uncommit merge changeset"))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	607 oldphase = old.phase()
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	608 updatebookmarks = _bookmarksupdater(repo, old.node())
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	609 # Recommit the filtered changeset
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	610 newid = None
314 ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	611 if (pats or opts.get('include') or opts.get('exclude')
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	612 or opts.get('all')):
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	613 match = scmutil.match(old, pats, opts)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	614 newid = _commitfiltered(repo, old, match)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	615 if newid is None:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	616 raise util.Abort(_('nothing to uncommit'))
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	617 # Move local changes on filtered changeset
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	618 repo.addobsolete(newid, old.node())
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	619 phases.retractboundary(repo, oldphase, [newid])
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	620 repo.dirstate.setparents(newid, node.nullid)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	621 _uncommitdirstate(repo, old, match)
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	622 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	623 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	624 ui.warn(_("new changeset is empty\n"))
da7509e7b50c evolve: warn when uncommit leave an empty changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 315 diff changeset	625 ui.status(_('(use "hg kill ." to remove it)\n'))
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	626 finally:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	627 wlock.release()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	628 finally:
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	629 lock.release()
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: 309 diff changeset	630
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	631 def commitwrapper(orig, ui, repo, arg, *kwargs):
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	632 lock = repo.lock()
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	633 try:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	634 obsoleted = kwargs.get('obsolete', [])
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	635 if obsoleted:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	636 obsoleted = repo.set('%lr', obsoleted)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	637 result = orig(ui, repo, arg, *kwargs)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	638 if not result: # commit successed
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	639 new = repo['-1']
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	640 oldbookmarks = []
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	641 for old in obsoleted:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	642 oldbookmarks.extend(repo.nodebookmarks(old.node()))
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	643 repo.addobsolete(new.node(), old.node())
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	644 for book in oldbookmarks:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	645 repo._bookmarks[book] = new.node()
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	646 if oldbookmarks:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	647 bookmarks.write(repo)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	648 return result
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	649 finally:
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 133 diff changeset	650 lock.release()
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	651
117 438fe133b068 Add a -o and -O option to graft. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 116 diff changeset	652 def graftwrapper(orig, ui, repo, revs, *kwargs):
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	653 lock = repo.lock()
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	654 try:
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	655 if kwargs.get('old_obsolete'):
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	656 obsoleted = kwargs.setdefault('obsolete', [])
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	657 if kwargs['continue']:
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	658 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	659 else:
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	660 obsoleted.extend(revs)
151 e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	661 # 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	662 obsoleted = kwargs.setdefault('obsolete', [])
e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	663 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	664 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	665
e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	666 raise error.Abort(_('Can not graft multiple revision while '
e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	667 'obsoleting (for now).'))
e73944b6be8f evolve: improve graft handling of -O Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 147 diff changeset	668
119 22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	669 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	670 finally:
22f2b700bd59 evolution: proper locking scheme Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 118 diff changeset	671 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	672
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	673 def extsetup(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	674 try:
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	675 obsolete = extensions.find('obsolete')
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	676 except KeyError:
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	677 raise error.Abort(_('evolution extension require obsolete extension.'))
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	678 try:
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	679 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	680 except KeyError:
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	681 rebase = None
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	682 raise error.Abort(_('evolution extension require rebase extension.'))
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	683
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	684 entry = extensions.wrapcommand(commands.table, 'commit', commitwrapper)
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	685 entry[1].append(('o', 'obsolete', [],
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	686 _("make commit obsolete this revision")))
117 438fe133b068 Add a -o and -O option to graft. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 116 diff changeset	687 entry = extensions.wrapcommand(commands.table, 'graft', graftwrapper)
303 8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	688 entry[1].append(('o', 'obsolete', [],
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	689 _("make graft obsoletes this revision")))
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	690 entry[1].append(('O', 'old-obsolete', False,
8529b4b95f5d evolve: tidy up a bit Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	691 _("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	692
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	693 # warning about more obsolete
309 de21685d22d1 evolve: warn when latecomer changeset are created Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 303 diff changeset	694 for cmd in ['commit', 'push', 'pull', 'graft', 'phase', 'unbundle']:
de21685d22d1 evolve: warn when latecomer changeset are created Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 303 diff changeset	695 entry = extensions.wrapcommand(commands.table, cmd, warnobserrors)
315 4bbc17716f5a uncommit: warn about new instability Patrick Mezard <patrick@mezard.eu> parents: 314 diff changeset	696 for cmd in ['amend', 'kill', 'uncommit']:
309 de21685d22d1 evolve: warn when latecomer changeset are created Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 303 diff changeset	697 entry = extensions.wrapcommand(cmdtable, cmd, warnobserrors)
211 69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	698
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	699 if rebase is not None:
309 de21685d22d1 evolve: warn when latecomer changeset are created Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 303 diff changeset	700 entry = extensions.wrapcommand(rebase.cmdtable, 'rebase', warnobserrors)

Mercurial > public > mercurial-scm > evolve

annotate hgext/evolve.py @ 355:72642a6970e0 stable