~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

merge diff header work from my 2.1 branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
1942
1942
    return user_encoding
1943
1943
 
1944
1944
 
 
1945
def get_diff_header_encoding():
 
1946
    if sys.platform == 'win32':
 
1947
        return 'mbcs'
 
1948
    else:
 
1949
        return 'utf8'
 
1950
 
 
1951
 
1945
1952
def get_host_name():
1946
1953
    """Return the current unicode host name.
1947
1954