Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 15231:cd6f10dccf16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil.bailifchanged: abort for dirty subrepos
author Eric Roshan Eisner <ede@alum.mit.edu>
date Tue, 11 Oct 2011 18:18:15 -0700
parents 231aac5280ba
children 9e99d2bbb1b1 195dbd1cef0c
comparison
equal deleted inserted replaced
15230:697289c5d415 15231:cd6f10dccf16
73 if repo.dirstate.p2() != nullid: 73 if repo.dirstate.p2() != nullid:
74 raise util.Abort(_('outstanding uncommitted merge')) 74 raise util.Abort(_('outstanding uncommitted merge'))
75 modified, added, removed, deleted = repo.status()[:4] 75 modified, added, removed, deleted = repo.status()[:4]
76 if modified or added or removed or deleted: 76 if modified or added or removed or deleted:
77 raise util.Abort(_("outstanding uncommitted changes")) 77 raise util.Abort(_("outstanding uncommitted changes"))
78 ctx = repo[None]
79 for s in ctx.substate:
80 if ctx.sub(s).dirty():
81 raise util.Abort(_("uncommitted changes in subrepo %s") % s)
78 82
79 def logmessage(ui, opts): 83 def logmessage(ui, opts):
80 """ get the log message according to -m and -l option """ 84 """ get the log message according to -m and -l option """
81 message = opts.get('message') 85 message = opts.get('message')
82 logfile = opts.get('logfile') 86 logfile = opts.get('logfile')