Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 5405:8feb33c2d153

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Display symlink or executable bit with manifest -v New output looks like: 644 a 755 * b/a 644 @ l
author Patrick Mezard <pmezard@gmail.com>
date Sat, 06 Oct 2007 22:30:22 +0200
parents 24de027551c1
children
comparison
equal deleted inserted replaced
5404:67d3daa8ac42 5405:8feb33c2d153
1882 or tip if no revision is checked out. 1882 or tip if no revision is checked out.
1883 1883
1884 The manifest is the list of files being version controlled. If no revision 1884 The manifest is the list of files being version controlled. If no revision
1885 is given then the first parent of the working directory is used. 1885 is given then the first parent of the working directory is used.
1886 1886
1887 With -v flag, print file permissions. With --debug flag, print 1887 With -v flag, print file permissions, symlink and executable bits. With
1888 file revision hashes. 1888 --debug flag, print file revision hashes.
1889 """ 1889 """
1890 1890
1891 if rev and node: 1891 if rev and node:
1892 raise util.Abort(_("please specify just one revision")) 1892 raise util.Abort(_("please specify just one revision"))
1893 1893
1900 1900
1901 for f in files: 1901 for f in files:
1902 if ui.debugflag: 1902 if ui.debugflag:
1903 ui.write("%40s " % hex(m[f])) 1903 ui.write("%40s " % hex(m[f]))
1904 if ui.verbose: 1904 if ui.verbose:
1905 ui.write("%3s " % (m.execf(f) and "755" or "644")) 1905 type = m.execf(f) and "*" or m.linkf(f) and "@" or " "
1906 perm = m.execf(f) and "755" or "644"
1907 ui.write("%3s %1s " % (perm, type))
1906 ui.write("%s\n" % f) 1908 ui.write("%s\n" % f)
1907 1909
1908 def merge(ui, repo, node=None, force=None, rev=None): 1910 def merge(ui, repo, node=None, force=None, rev=None):
1909 """merge working directory with another revision 1911 """merge working directory with another revision
1910 1912