equal
deleted
inserted
replaced
1864 raise util.Abort(_("please specify just one revision")) |
1864 raise util.Abort(_("please specify just one revision")) |
1865 |
1865 |
1866 if not node: |
1866 if not node: |
1867 node = rev |
1867 node = rev |
1868 |
1868 |
1869 m = repo[node].manifest() |
1869 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '} |
1870 files = m.keys() |
1870 ctx = repo[node] |
1871 files.sort() |
1871 for f in ctx: |
1872 |
|
1873 for f in files: |
|
1874 if ui.debugflag: |
1872 if ui.debugflag: |
1875 ui.write("%40s " % hex(m[f])) |
1873 ui.write("%40s " % hex(ctx.manifest()[f])) |
1876 if ui.verbose: |
1874 if ui.verbose: |
1877 type = m.execf(f) and "*" or m.linkf(f) and "@" or " " |
1875 ui.write(decor[ctx.flags(f)]) |
1878 perm = m.execf(f) and "755" or "644" |
|
1879 ui.write("%3s %1s " % (perm, type)) |
|
1880 ui.write("%s\n" % f) |
1876 ui.write("%s\n" % f) |
1881 |
1877 |
1882 def merge(ui, repo, node=None, force=None, rev=None): |
1878 def merge(ui, repo, node=None, force=None, rev=None): |
1883 """merge working directory with another revision |
1879 """merge working directory with another revision |
1884 |
1880 |