Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 2718:a593813241e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
makes 'hg diff' diff the file in sorted order
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 28 Jul 2006 18:46:02 +0200
parents 14ebe97542a7
children 42a02b5773d4 ad4155e757da
comparison
equal deleted inserted replaced
2717:14ebe97542a7 2718:a593813241e5
430 ignorews = opts.get('ignore_all_space') or diffopts['ignorews'] 430 ignorews = opts.get('ignore_all_space') or diffopts['ignorews']
431 ignorewsamount = opts.get('ignore_space_change') or \ 431 ignorewsamount = opts.get('ignore_space_change') or \
432 diffopts['ignorewsamount'] 432 diffopts['ignorewsamount']
433 ignoreblanklines = opts.get('ignore_blank_lines') or \ 433 ignoreblanklines = opts.get('ignore_blank_lines') or \
434 diffopts['ignoreblanklines'] 434 diffopts['ignoreblanklines']
435 for f in modified: 435
436 all = modified + added + removed
437 all.sort()
438 for f in all:
436 to = None 439 to = None
440 tn = None
437 if f in mmap: 441 if f in mmap:
438 to = repo.file(f).read(mmap[f]) 442 to = repo.file(f).read(mmap[f])
439 tn = read(f) 443 if f not in removed:
440 fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text, 444 tn = read(f)
441 showfunc=showfunc, ignorews=ignorews,
442 ignorewsamount=ignorewsamount,
443 ignoreblanklines=ignoreblanklines))
444 for f in added:
445 to = None
446 tn = read(f)
447 fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text,
448 showfunc=showfunc, ignorews=ignorews,
449 ignorewsamount=ignorewsamount,
450 ignoreblanklines=ignoreblanklines))
451 for f in removed:
452 to = repo.file(f).read(mmap[f])
453 tn = None
454 fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text, 445 fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text,
455 showfunc=showfunc, ignorews=ignorews, 446 showfunc=showfunc, ignorews=ignorews,
456 ignorewsamount=ignorewsamount, 447 ignorewsamount=ignorewsamount,
457 ignoreblanklines=ignoreblanklines)) 448 ignoreblanklines=ignoreblanklines))
458 449