Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 10282:08a0f04b56bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
many, many trivial check-code fixups
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Jan 2010 00:05:27 -0600
parents 25e572394f5c
children d42821cd5c96
comparison
equal deleted inserted replaced
10281:e7d3b509af8b 10282:08a0f04b56bd
346 _update = update 346 _update = update
347 347
348 def clean(repo, node, show_stats=True): 348 def clean(repo, node, show_stats=True):
349 """forcibly switch the working directory to node, clobbering changes""" 349 """forcibly switch the working directory to node, clobbering changes"""
350 stats = _merge.update(repo, node, False, True, None) 350 stats = _merge.update(repo, node, False, True, None)
351 if show_stats: _showstats(repo, stats) 351 if show_stats:
352 _showstats(repo, stats)
352 return stats[3] > 0 353 return stats[3] > 0
353 354
354 def merge(repo, node, force=None, remind=True): 355 def merge(repo, node, force=None, remind=True):
355 """branch merge with node, resolving changes""" 356 """branch merge with node, resolving changes"""
356 stats = _merge.update(repo, node, True, force, False) 357 stats = _merge.update(repo, node, True, force, False)