Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 13878:a8d13ee0ce68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
misc: replace .parents()[0] with p1()
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Apr 2011 16:21:59 -0500
parents 8796fb6af67e
children 03f3ce7ca2a8
comparison
equal deleted inserted replaced
13877:653121e6941f 13878:a8d13ee0ce68
70 return None 70 return None
71 71
72 return p 72 return p
73 73
74 def bail_if_changed(repo): 74 def bail_if_changed(repo):
75 if repo.dirstate.parents()[1] != nullid: 75 if repo.dirstate.p2() != nullid:
76 raise util.Abort(_('outstanding uncommitted merge')) 76 raise util.Abort(_('outstanding uncommitted merge'))
77 modified, added, removed, deleted = repo.status()[:4] 77 modified, added, removed, deleted = repo.status()[:4]
78 if modified or added or removed or deleted: 78 if modified or added or removed or deleted:
79 raise util.Abort(_("outstanding uncommitted changes")) 79 raise util.Abort(_("outstanding uncommitted changes"))
80 80
120 raise util.Abort(_('empty revision set')) 120 raise util.Abort(_('empty revision set'))
121 return repo[l[-1]] 121 return repo[l[-1]]
122 122
123 def revpair(repo, revs): 123 def revpair(repo, revs):
124 if not revs: 124 if not revs:
125 return repo.dirstate.parents()[0], None 125 return repo.dirstate.p1(), None
126 126
127 l = revrange(repo, revs) 127 l = revrange(repo, revs)
128 128
129 if len(l) == 0: 129 if len(l) == 0:
130 return repo.dirstate.parents()[0], None 130 return repo.dirstate.p1(), None
131 131
132 if len(l) == 1: 132 if len(l) == 1:
133 return repo.lookup(l[0]), None 133 return repo.lookup(l[0]), None
134 134
135 return repo.lookup(l[0]), repo.lookup(l[-1]) 135 return repo.lookup(l[0]), repo.lookup(l[-1])