Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 5760:0145f9afb0e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed tabs and trailing whitespace in python files
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 29 Dec 2007 19:49:48 +0100
parents 8ee0de123989
children c2a21fe60994
comparison
equal deleted inserted replaced
5759:027264e720aa 5760:0145f9afb0e7
715 if patchproblems: 715 if patchproblems:
716 if ui.config('ui', 'patch'): 716 if ui.config('ui', 'patch'):
717 ui.write(_(" (Current patch tool may be incompatible with patch," 717 ui.write(_(" (Current patch tool may be incompatible with patch,"
718 " or misconfigured. Please check your .hgrc file)\n")) 718 " or misconfigured. Please check your .hgrc file)\n"))
719 else: 719 else:
720 ui.write(_(" Internal patcher failure, please report this error" 720 ui.write(_(" Internal patcher failure, please report this error"
721 " to http://www.selenic.com/mercurial/bts\n")) 721 " to http://www.selenic.com/mercurial/bts\n"))
722 problems += patchproblems 722 problems += patchproblems
723 723
724 os.unlink(fa) 724 os.unlink(fa)
725 os.unlink(fd) 725 os.unlink(fd)
1700 or tip if no revision is checked out. 1700 or tip if no revision is checked out.
1701 1701
1702 The manifest is the list of files being version controlled. If no revision 1702 The manifest is the list of files being version controlled. If no revision
1703 is given then the first parent of the working directory is used. 1703 is given then the first parent of the working directory is used.
1704 1704
1705 With -v flag, print file permissions, symlink and executable bits. With 1705 With -v flag, print file permissions, symlink and executable bits. With
1706 --debug flag, print file revision hashes. 1706 --debug flag, print file revision hashes.
1707 """ 1707 """
1708 1708
1709 if rev and node: 1709 if rev and node:
1710 raise util.Abort(_("please specify just one revision")) 1710 raise util.Abort(_("please specify just one revision"))