Mercurial > hg
changeset 1030:28e2f13ca7c4
Merge with MPM.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue, 23 Aug 2005 21:57:22 -0700 |
| parents | b5f0ccad8917 (current diff) 836667830fee (diff) |
| children | 503aaf19a040 |
| files | mercurial/commands.py |
| diffstat | 5 files changed, 55 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/hg.1.txt Tue Aug 23 21:53:13 2005 -0700 +++ b/doc/hg.1.txt Tue Aug 23 21:57:22 2005 -0700 @@ -71,8 +71,13 @@ This command is useful to discover who did a change or when a change took place. + + Without the -a option, annotate will avoid processing files it + detects as binary. With -a, annotate will generate an annotation + anyway, probably with undesirable results. options: + -a, --text treat all files as text -I, --include <pat> include names matching the given patterns -X, --exclude <pat> exclude names matching the given patterns -r, --revision <rev> annotate the specified revision @@ -128,7 +133,7 @@ This command takes effect for the next commit. -diff [-r revision] [-r revision] [files ...]:: +diff [-a] [-r revision] [-r revision] [files ...]:: Show differences between revisions for the specified files. Differences between files are shown using the unified diff format. @@ -139,7 +144,12 @@ revisions are specified, the working directory files are compared to its parent. + Without the -a option, diff will avoid generating diffs of files + it detects as binary. With -a, diff will generate a diff anyway, + probably with undesirable results. + options: + -a, --text treat all files as text -I, --include <pat> include names matching the given patterns -X, --exclude <pat> exclude names matching the given patterns @@ -161,8 +171,12 @@ %n zero-padded sequence number, starting at 1 %r zero-padded changeset revision number - Options: + Without the -a option, export will avoid generating diffs of files + it detects as binary. With -a, export will generate a diff anyway, + probably with undesirable results. + options: + -a, --text treat all files as text -o, --output <filespec> print output to file with formatted named forget [options] [files]::
--- a/mercurial/commands.py Tue Aug 23 21:53:13 2005 -0700 +++ b/mercurial/commands.py Tue Aug 23 21:57:22 2005 -0700 @@ -140,7 +140,8 @@ return open(make_filename(repo, r, pat, node, total, seqno, revwidth), mode) -def dodiff(fp, ui, repo, files=None, node1=None, node2=None, match=util.always, changes=None): +def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always, + changes=None, text=False): def date(c): return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) @@ -182,15 +183,15 @@ if f in mmap: to = repo.file(f).read(mmap[f]) tn = read(f) - fp.write(mdiff.unidiff(to, date1, tn, date2, f, r)) + fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text)) for f in a: to = None tn = read(f) - fp.write(mdiff.unidiff(to, date1, tn, date2, f, r)) + fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text)) for f in d: to = repo.file(f).read(mmap[f]) tn = None - fp.write(mdiff.unidiff(to, date1, tn, date2, f, r)) + fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text)) def show_changeset(ui, repo, rev=0, changenode=None, filelog=None, brinfo=None): """show a single changeset or file revision""" @@ -432,12 +433,18 @@ node = repo.dirstate.parents()[0] change = repo.changelog.read(node) mmap = repo.manifest.read(change[0]) + for src, abs, rel, exact in walk(repo, pats, opts): if abs not in mmap: ui.warn("warning: %s is not in the repository!\n" % rel) continue - lines = repo.file(abs).annotate(mmap[abs]) + f = repo.file(abs) + if not opts['text'] and util.binary(f.read(mmap[abs])): + ui.write("%s: binary file\n" % rel) + continue + + lines = f.annotate(mmap[abs]) pieces = [] for o, f in opmap: @@ -650,10 +657,13 @@ def diff(ui, repo, *pats, **opts): """diff working directory (or selected files)""" - revs = [] - if opts['rev']: - revs = map(lambda x: repo.lookup(x), opts['rev']) + node1, node2 = None, None + revs = [repo.lookup(x) for x in opts['rev']] + if len(revs) > 0: + node1 = revs[0] + if len(revs) > 1: + node2 = revs[1] if len(revs) > 2: raise util.Abort("too many revisions to diff") @@ -663,7 +673,9 @@ roots, match, results = makewalk(repo, pats, opts) for src, abs, rel, exact in results: files.append(abs) - dodiff(sys.stdout, ui, repo, files, *revs, **{'match': match}) + + dodiff(sys.stdout, ui, repo, node1, node2, files, match=match, + text=opts['text']) def doexport(ui, repo, changeset, seqno, total, revwidth, opts): node = repo.lookup(changeset) @@ -685,7 +697,7 @@ fp.write(change[4].rstrip()) fp.write("\n\n") - dodiff(fp, ui, repo, None, prev, node) + dodiff(fp, ui, repo, prev, node, text=opts['text']) if fp != sys.stdout: fp.close() def export(ui, repo, *changesets, **opts): @@ -868,7 +880,7 @@ i = filelog.linkrev(filenode) changenode = repo.changelog.node(i) prev, other = repo.changelog.parents(changenode) - dodiff(sys.stdout, ui, repo, files, prev, changenode) + dodiff(sys.stdout, ui, repo, prev, changenode, files) ui.write("\n\n") def manifest(ui, repo, rev=None): @@ -1286,6 +1298,7 @@ "^annotate": (annotate, [('r', 'rev', '', 'revision'), + ('a', 'text', None, 'treat all files as text'), ('u', 'user', None, 'show user'), ('n', 'number', None, 'show revision number'), ('c', 'changeset', None, 'show changeset'), @@ -1327,12 +1340,14 @@ "^diff": (diff, [('r', 'rev', [], 'revision'), + ('a', 'text', None, 'treat all files as text'), ('I', 'include', [], 'include path in search'), ('X', 'exclude', [], 'exclude path from search')], 'hg diff [-I] [-X] [-r REV1 [-r REV2]] [FILE]...'), "^export": (export, - [('o', 'output', "", 'output to file')], + [('o', 'output', "", 'output to file'), + ('a', 'text', None, 'treat all files as text')], "hg export [-o OUTFILE] REV..."), "forget": (forget,
--- a/mercurial/hg.py Tue Aug 23 21:53:13 2005 -0700 +++ b/mercurial/hg.py Tue Aug 23 21:57:22 2005 -0700 @@ -272,6 +272,8 @@ manifest = bin(l[0]) user = l[1] date = l[2] + if " " not in date: + date += " 0" # some tools used -d without a timezone files = l[3:] return (manifest, user, date, files, desc)
--- a/mercurial/mdiff.py Tue Aug 23 21:53:13 2005 -0700 +++ b/mercurial/mdiff.py Tue Aug 23 21:57:22 2005 -0700 @@ -7,12 +7,15 @@ import difflib, struct, bdiff from mpatch import * +from util import * -def unidiff(a, ad, b, bd, fn, r=None): +def unidiff(a, ad, b, bd, fn, r=None, text=False): if not a and not b: return "" - if a == None: + if not text and (binary(a) or binary(b)): + l = ['Binary file %s has changed\n' % fn] + elif a == None: b = b.splitlines(1) l1 = "--- %s\t%s\n" % ("/dev/null", ad) l2 = "+++ %s\t%s\n" % ("b/" + fn, bd)