/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Alexander Belchenko
  • Date: 2007-03-13 02:16:17 UTC
  • mfrom: (2346 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2356.
  • Revision ID: bialix@ukr.net-20070313021617-azd5lv30b23gyu48
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
30
30
    osutils,
31
31
    patiencediff,
32
32
    textfile,
 
33
    timestamp,
33
34
    )
34
35
""")
35
36
 
110
111
        path = os.environ.get('PATH')
111
112
        if path is not None:
112
113
            env['PATH'] = path
113
 
        if sys.platform == 'win32':
114
 
            # diffutils+gettext from http://gnuwin32.sf.net use only LANGUAGE
115
 
            env['LANGUAGE'] = 'C'
116
 
        else:
117
 
            env['LANG'] = 'C'
118
 
            env['LC_ALL'] = 'C'
 
114
        env['LANGUAGE'] = 'C'   # on win32 only LANGUAGE has effect
 
115
        env['LANG'] = 'C'
 
116
        env['LC_ALL'] = 'C'
119
117
        stderr = subprocess.PIPE
120
118
    else:
121
119
        env = None
487
485
 
488
486
def _patch_header_date(tree, file_id, path):
489
487
    """Returns a timestamp suitable for use in a patch header."""
490
 
    tm = time.gmtime(tree.get_file_mtime(file_id, path))
491
 
    return time.strftime('%Y-%m-%d %H:%M:%S +0000', tm)
 
488
    return timestamp.format_patch_date(tree.get_file_mtime(file_id, path))
492
489
 
493
490
 
494
491
def _raise_if_nonexistent(paths, old_tree, new_tree):