Show More
@@ -8,7 +8,7 b'' | |||||
8 | from demandload import demandload |
|
8 | from demandload import demandload | |
9 | from node import * |
|
9 | from node import * | |
10 | from i18n import gettext as _ |
|
10 | from i18n import gettext as _ | |
11 |
demandload(globals(), "os re sys signal shutil imp urllib pdb |
|
11 | demandload(globals(), "os re sys signal shutil imp urllib pdb") | |
12 | demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo") |
|
12 | demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo") | |
13 | demandload(globals(), "fnmatch mdiff random signal tempfile time") |
|
13 | demandload(globals(), "fnmatch mdiff random signal tempfile time") | |
14 | demandload(globals(), "traceback errno socket version struct atexit sets bz2") |
|
14 | demandload(globals(), "traceback errno socket version struct atexit sets bz2") | |
@@ -385,16 +385,14 b' def dodiff(fp, ui, repo, node1, node2, f' | |||||
385 | def read(f): |
|
385 | def read(f): | |
386 | return repo.file(f).read(mmap2[f]) |
|
386 | return repo.file(f).read(mmap2[f]) | |
387 | else: |
|
387 | else: | |
|
388 | tz = util.makedate()[1] | |||
388 | _date2 = util.datestr() |
|
389 | _date2 = util.datestr() | |
389 | _tz = util.makedate()[1] |
|
|||
390 | def date2(f): |
|
390 | def date2(f): | |
391 | try: |
|
391 | try: | |
392 | _f = repo.wopener(f) |
|
392 | return util.datestr((os.lstat(repo.wjoin(f)).st_mtime, tz)) | |
393 | except IOError, err: |
|
393 | except IOError, err: | |
394 |
if err |
|
394 | if err.errno != errno.ENOENT: raise | |
395 | raise |
|
|||
396 | return _date2 |
|
395 | return _date2 | |
397 | return util.datestr((os.fstat(_f.fileno())[stat.ST_MTIME], _tz)) |
|
|||
398 | def read(f): |
|
396 | def read(f): | |
399 | return repo.wread(f) |
|
397 | return repo.wread(f) | |
400 |
|
398 |
General Comments 0
You need to be logged in to leave comments.
Login now