Mercurial > public > mercurial-scm > evolve
diff hgext/evolve.py @ 420:b6163a85ddac
merge
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Sun, 05 Aug 2012 12:02:45 +0200 |
parents | 03672e955bc8 18a0d96ed559 |
children | 3f8c11865ed2 |
line wrap: on
line diff
--- a/hgext/evolve.py Sat Aug 04 12:44:51 2012 +0200 +++ b/hgext/evolve.py Sun Aug 05 12:02:45 2012 +0200 @@ -359,7 +359,7 @@ new = [node.nullid] for n in targetnodes: if not repo[n].mutable(): - ui.warn(_("Can't kill immutable changeset %s") % repo[n]) + ui.warn(_("cannot kill immutable changeset %s\n") % repo[n]) else: for ne in new: repo.addobsolete(ne, n) @@ -637,17 +637,16 @@ kwargs = dict(kwargs) revs = list(revs) + kwargs.get('rev', []) kwargs['rev'] = [] + obsoleted = kwargs.setdefault('obsolete', []) lock = repo.lock() try: if kwargs.get('old_obsolete'): - obsoleted = kwargs.setdefault('obsolete', []) - if kwargs['continue']: + if kwargs.get('continue'): obsoleted.extend(repo.opener.read('graftstate').splitlines()) else: obsoleted.extend(revs) # convert obsolete target into revs to avoid alias joke - obsoleted = kwargs.setdefault('obsolete', []) obsoleted[:] = [str(i) for i in repo.revs('%lr', obsoleted)] if obsoleted and len(revs) > 1: @@ -662,12 +661,12 @@ try: obsolete = extensions.find('obsolete') except KeyError: - raise error.Abort(_('evolution extension require obsolete extension.')) + raise error.Abort(_('evolution extension requires obsolete extension.')) try: rebase = extensions.find('rebase') except KeyError: rebase = None - raise error.Abort(_('evolution extension require rebase extension.')) + raise error.Abort(_('evolution extension requires rebase extension.')) for cmd in ['amend', 'kill', 'uncommit']: entry = extensions.wrapcommand(cmdtable, cmd,