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 0f97b1641f2a…

Parents 2d753defe42e…

Parents 3b07cb23c6ab…

by Steve Borho

Changes to 36 files · Browse files at 0f97b1641f2a Showing diff from parent 2d753defe42e 3b07cb23c6ab Diff from another changeset...

Change 1 of 1 Show Entire File .hgtags Stacked
 
54
55
56
 
 
54
55
56
57
@@ -54,3 +54,4 @@
 ee531052f78b11dafe1d8c7ab9cfb95b4854be38 2.0.1  5333ccf1184864720c1d3690df94fa47df80bf02 2.0.2  d5cd872f61fde0c1d1b279af4f3b90ff6ade3161 2.0.3 +26a8187ef879c83c2055044fa2080a640145d542 2.0.4
Change 1 of 1 Show Entire File doc/​source/​conf.py Stacked
 
51
52
53
54
 
55
56
57
 
51
52
53
 
54
55
56
57
@@ -51,7 +51,7 @@
 # The short X.Y version.  version = '2.0'  # The full version, including alpha/beta/rc tags. -release = '2.0.3' +release = '2.0.4'    # The language for content autogenerated by Sphinx. Refer to documentation  # for a list of supported languages.
Show Entire File i18n/​tortoisehg/​ca.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​cs.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​da.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​de.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_AU.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_GB.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​es.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​et.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fa.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​he.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hu.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​it.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ja.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ko.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nb.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nn.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​oc.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt_BR.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ru.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​sr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​sv.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​tr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​uk.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_CN.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_TW.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 1 Show Entire File setup.py Stacked
 
79
80
81
 
 
82
83
84
 
79
80
81
82
83
84
85
86
@@ -79,6 +79,8 @@
  'contrib/win32',   'tortoisehg',   'tortoisehg/hgqt', + 'tortoisehg/hgtk', + 'tortoisehg/hgtk/logview',   'tortoisehg/util',   'tortoisehg/thgutil/iniparse',   ]
Show Entire File tortoisehg/​hgqt/​backout.py Stacked
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
 
236
237
238
 
239
240
241
242
 
 
243
244
245
246
247
248
 
249
250
251
252
 
253
254
255
256
 
 
257
258
 
 
259
260
261
 
236
237
238
239
240
241
 
 
242
243
244
245
246
247
248
 
249
250
 
 
 
251
252
 
 
 
253
254
255
 
256
257
258
259
260
@@ -236,26 +236,25 @@
  if isinstance(ctx, patchctx):   repo.thgbackup(ctx._path)   fp = util.atomictempfile(ctx._path, 'wb') + buf = cStringIO.StringIO()   try:   if ctx._ph.comments: - fp.write('\n'.join(ctx._ph.comments)) - fp.write('\n\n') + buf.write('\n'.join(ctx._ph.comments)) + buf.write('\n\n')   needsnewline = False   for wfile in ctx._fileorder:   if wfile == self.currentFile:   if revertall:   continue - chunks[0].write(fp) + chunks[0].write(buf)   for chunk in kchunks: - chunk.write(fp) - if not chunks[-1].selected: - needsnewline = True + chunk.write(buf)   else: - if needsnewline: - fp.write('\n') - needsnewline = False + if buf.tell() and buf.getvalue()[-1] != '\n': + buf.write('\n')   for chunk in ctx._files[wfile]: - chunk.write(fp) + chunk.write(buf) + fp.write(buf.getvalue())   fp.rename()   finally:   del fp
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​shelve.py Stacked
 
183
184
185
 
 
186
187
188
 
183
184
185
186
187
188
189
190
@@ -183,6 +183,8 @@
    self.statusbar = cmdui.ThgStatusBar(self)   self.layout().addWidget(self.statusbar) + self.showMessage(_('Backup copies of modified files can be found ' + 'in .hg/Trashcan/'))     self.refreshCombos()   repo.repositoryChanged.connect(self.refreshCombos)