Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 1c3ca873cc4b…

Parents 8ada4f4e59d8…

Parents 4b78b9a94dd0…

by Steve Borho

Changes to 2 files · Browse files at 1c3ca873cc4b Showing diff from parent 8ada4f4e59d8 4b78b9a94dd0 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
 
112
113
114
 
 
 
 
 
115
116
 
117
118
119
 
120
121
122
 
112
113
114
115
116
117
118
119
120
 
121
122
123
 
124
125
126
127
@@ -112,11 +112,16 @@
  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: + except (patch.PatchError, EnvironmentError), err:   ok = False   self.showMessage.emit(hglib.tounicode(str(err)))   os.chdir(curdir)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filelistview.py Stacked
 
240
241
242
243
 
 
244
245
246
 
240
241
242
 
243
244
245
246
247
@@ -240,7 +240,8 @@
  self.addAction(act)     def contextMenuEvent(self, event): - itemissubrepo = self.currentFile() in self.model()._ctx.substate.keys() + itemissubrepo = (self.model().dataFromIndex(self.currentIndex())['status'] == 'S') +   # Subrepos and regular items have different context menus   if itemissubrepo:   contextmenu = self.subrepocontextmenu