209 |
209 |
210 # This should instead be several functions with short arglists, like |
210 # This should instead be several functions with short arglists, like |
211 # update/merge/revert |
211 # update/merge/revert |
212 |
212 |
213 def update(repo, node, allow=False, force=False, choose=None, |
213 def update(repo, node, allow=False, force=False, choose=None, |
214 moddirstate=True, forcemerge=False, wlock=None, show_stats=True): |
214 moddirstate=True, forcemerge=False, wlock=None, show_stats=True, |
|
215 remind=True): |
215 return merge.update(repo, node, allow, force, choose, moddirstate, |
216 return merge.update(repo, node, allow, force, choose, moddirstate, |
216 forcemerge, wlock, show_stats) |
217 forcemerge, wlock, show_stats, remind) |
217 |
218 |
218 def verify(repo): |
219 def verify(repo): |
219 """verify the consistency of a repository""" |
220 """verify the consistency of a repository""" |
220 import verify as _verify |
221 import verify as _verify |
221 return _verify.verify(repo) |
222 return _verify.verify(repo) |