Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 4726:f6e961c0155b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix and test 'hg backout' without or with too many revisions.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 26 Jun 2007 15:28:17 +0200
parents 934275cd4526
children eadfaa9ec487
comparison
equal deleted inserted replaced
4725:cf8b8f62688a 4726:f6e961c0155b
166 if rev and node: 166 if rev and node:
167 raise util.Abort(_("please specify just one revision")) 167 raise util.Abort(_("please specify just one revision"))
168 168
169 if not rev: 169 if not rev:
170 rev = node 170 rev = node
171
172 if not rev:
173 raise util.Abort(_("please specify a revision to backout"))
171 174
172 cmdutil.bail_if_changed(repo) 175 cmdutil.bail_if_changed(repo)
173 op1, op2 = repo.dirstate.parents() 176 op1, op2 = repo.dirstate.parents()
174 if op2 != nullid: 177 if op2 != nullid:
175 raise util.Abort(_('outstanding uncommitted merge')) 178 raise util.Abort(_('outstanding uncommitted merge'))