← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-23 08:19:28 UTC
  • mfrom: (5317 +trunk)
  • mto: (5247.1.11 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100623081928-z9q18q30oo5as831
Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
1955
1955
    return user_encoding
1956
1956
 
1957
1957
 
 
1958
def get_diff_header_encoding():
 
1959
    return get_terminal_encoding()
 
1960
 
 
1961
 
1958
1962
def get_host_name():
1959
1963
    """Return the current unicode host name.
1960
1964