Show More
@@ -549,7 +549,7 b' def debugindexdot(ui, file_):' | |||||
549 | ui.write("\t%d -> %d\n" % (r.rev(e[5]), i)) |
|
549 | ui.write("\t%d -> %d\n" % (r.rev(e[5]), i)) | |
550 | ui.write("}\n") |
|
550 | ui.write("}\n") | |
551 |
|
551 | |||
552 |
def diff(ui, repo, * |
|
552 | def diff(ui, repo, *pats, **opts): | |
553 | """diff working directory (or selected files)""" |
|
553 | """diff working directory (or selected files)""" | |
554 | revs = [] |
|
554 | revs = [] | |
555 | if opts['rev']: |
|
555 | if opts['rev']: | |
@@ -558,11 +558,9 b' def diff(ui, repo, *files, **opts):' | |||||
558 | if len(revs) > 2: |
|
558 | if len(revs) > 2: | |
559 | raise Abort("too many revisions to diff") |
|
559 | raise Abort("too many revisions to diff") | |
560 |
|
560 | |||
561 |
|
|
561 | files = [] | |
562 | files = relpath(repo, files) |
|
562 | for src, abs, rel in walk(repo, pats, opts): | |
563 | else: |
|
563 | files.append(abs) | |
564 | files = relpath(repo, [""]) |
|
|||
565 |
|
||||
566 | dodiff(sys.stdout, ui, repo, files, *revs) |
|
564 | dodiff(sys.stdout, ui, repo, files, *revs) | |
567 |
|
565 | |||
568 | def doexport(ui, repo, changeset, seqno, total, revwidth, opts): |
|
566 | def doexport(ui, repo, changeset, seqno, total, revwidth, opts): | |
@@ -1126,7 +1124,9 b' table = {' | |||||
1126 | "debugindexdot": (debugindexdot, [], 'debugindexdot FILE'), |
|
1124 | "debugindexdot": (debugindexdot, [], 'debugindexdot FILE'), | |
1127 | "^diff": |
|
1125 | "^diff": | |
1128 | (diff, |
|
1126 | (diff, | |
1129 | [('r', 'rev', [], 'revision')], |
|
1127 | [('I', 'include', [], 'include path in search'), | |
|
1128 | ('X', 'exclude', [], 'exclude path from search'), | |||
|
1129 | ('r', 'rev', [], 'revision')], | |||
1130 | 'hg diff [-r REV1 [-r REV2]] [FILE]...'), |
|
1130 | 'hg diff [-r REV1 [-r REV2]] [FILE]...'), | |
1131 | "^export": |
|
1131 | "^export": | |
1132 | (export, |
|
1132 | (export, |
General Comments 0
You need to be logged in to leave comments.
Login now