equal
deleted
inserted
replaced
113 c = expander[c]() |
113 c = expander[c]() |
114 newname.append(c) |
114 newname.append(c) |
115 i += 1 |
115 i += 1 |
116 return ''.join(newname) |
116 return ''.join(newname) |
117 |
117 |
118 def dodiff(fp, ui, repo, files = None, node1 = None, node2 = None): |
118 def dodiff(fp, ui, repo, files=None, node1=None, node2=None): |
119 def date(c): |
119 def date(c): |
120 return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) |
120 return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) |
121 |
121 |
122 (c, a, d, u) = repo.changes(node1, node2, files) |
122 (c, a, d, u) = repo.changes(node1, node2, files) |
123 if files: |
123 if files: |
761 files.sort() |
761 files.sort() |
762 |
762 |
763 for f in files: |
763 for f in files: |
764 ui.write("%40s %3s %s\n" % (hg.hex(m[f]), mf[f] and "755" or "644", f)) |
764 ui.write("%40s %3s %s\n" % (hg.hex(m[f]), mf[f] and "755" or "644", f)) |
765 |
765 |
766 def parents(ui, repo, node = None): |
766 def parents(ui, repo, node=None): |
767 '''show the parents of the current working dir''' |
767 '''show the parents of the current working dir''' |
768 if node: |
768 if node: |
769 p = repo.changelog.parents(repo.lookup(hg.bin(node))) |
769 p = repo.changelog.parents(repo.lookup(hg.bin(node))) |
770 else: |
770 else: |
771 p = repo.dirstate.parents() |
771 p = repo.dirstate.parents() |
993 for f in d: |
993 for f in d: |
994 ui.write("R ", f, "\n") |
994 ui.write("R ", f, "\n") |
995 for f in u: |
995 for f in u: |
996 ui.write("? ", f, "\n") |
996 ui.write("? ", f, "\n") |
997 |
997 |
998 def tag(ui, repo, name, rev = None, **opts): |
998 def tag(ui, repo, name, rev=None, **opts): |
999 """add a tag for the current tip or a given revision""" |
999 """add a tag for the current tip or a given revision""" |
1000 |
1000 |
1001 if name == "tip": |
1001 if name == "tip": |
1002 ui.warn("abort: 'tip' is a reserved name!\n") |
1002 ui.warn("abort: 'tip' is a reserved name!\n") |
1003 return -1 |
1003 return -1 |