Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 19801:41abe2e3e3b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: standardize error message for dirty update --check This and following patches will standardize the error message for dirty working directories to "uncommitted changes".
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 20:33:02 -0700
parents a9abdb168425
children 681f7b9213a4
comparison
equal deleted inserted replaced
19800:4894e0d9462d 19801:41abe2e3e3b7
5848 rev = cmdutil.finddate(ui, repo, date) 5848 rev = cmdutil.finddate(ui, repo, date)
5849 5849
5850 if check: 5850 if check:
5851 c = repo[None] 5851 c = repo[None]
5852 if c.dirty(merge=False, branch=False, missing=True): 5852 if c.dirty(merge=False, branch=False, missing=True):
5853 raise util.Abort(_("uncommitted local changes")) 5853 raise util.Abort(_("uncommitted changes"))
5854 if rev is None: 5854 if rev is None:
5855 rev = repo[repo[None].branch()].rev() 5855 rev = repo[repo[None].branch()].rev()
5856 mergemod._checkunknown(repo, repo[None], repo[rev]) 5856 mergemod._checkunknown(repo, repo[None], repo[rev])
5857 5857
5858 if clean: 5858 if clean: