Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.3, 2.0.4, and 2.0.5

stable chunks: provide eolmode to patch.applydiff (refs #442)

My guess is that this will fix operation with the eol extension, but would like
outside confirmation before marking this issue closed.

Changeset eba352b8e43b…

Parent 82fa505dabaa…

by Steve Borho

Changes to one file · Browse files at eba352b8e43b Showing diff from parent 82fa505dabaa Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
 
112
113
114
 
 
 
 
 
115
116
 
117
118
119
 
112
113
114
115
116
117
118
119
120
 
121
122
123
124
@@ -112,8 +112,13 @@
  pfiles = {}   curdir = os.getcwd()   try: + eolmode = ui.config('patch', 'eol', 'strict') + if eolmode.lower() not in patch.eolmodes: + eolmode = 'strict' + else: + eolmode = eolmode.lower()   os.chdir(repo.root) - if patch.applydiff(ui, fp, pfiles) < 0: + if patch.applydiff(ui, fp, pfiles, eolmode=eolmode) < 0:   ok = False   self.showMessage.emit(_('Patch failed to apply'))   except patch.PatchError, err: