Mercurial > hg-stable
comparison mercurial/hg.py @ 27403:50b6a04f817f
histedit: omit useless message from abort
specifically:
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Mon, 14 Dec 2015 22:08:14 +0000 |
| parents | 5184089f5d30 |
| children | 1cf3543cc780 |
comparison
equal
deleted
inserted
replaced
| 27402:5184089f5d30 | 27403:50b6a04f817f |
|---|---|
| 661 return stats[3] > 0 | 661 return stats[3] > 0 |
| 662 | 662 |
| 663 # naming conflict in clone() | 663 # naming conflict in clone() |
| 664 _update = update | 664 _update = update |
| 665 | 665 |
| 666 def clean(repo, node, show_stats=True): | 666 def clean(repo, node, show_stats=True, quietempty=False): |
| 667 """forcibly switch the working directory to node, clobbering changes""" | 667 """forcibly switch the working directory to node, clobbering changes""" |
| 668 stats = updaterepo(repo, node, True) | 668 stats = updaterepo(repo, node, True) |
| 669 util.unlinkpath(repo.join('graftstate'), ignoremissing=True) | 669 util.unlinkpath(repo.join('graftstate'), ignoremissing=True) |
| 670 if show_stats: | 670 if show_stats: |
| 671 _showstats(repo, stats) | 671 _showstats(repo, stats, quietempty) |
| 672 return stats[3] > 0 | 672 return stats[3] > 0 |
| 673 | 673 |
| 674 def merge(repo, node, force=None, remind=True): | 674 def merge(repo, node, force=None, remind=True): |
| 675 """Branch merge with node, resolving changes. Return true if any | 675 """Branch merge with node, resolving changes. Return true if any |
| 676 unresolved conflicts.""" | 676 unresolved conflicts.""" |