We are currently indexing your data, so search results may be incomplete until we finish.
Merge with stable
by
Changes to 36 files · Browse files at 0f97b1641f2a Showing diff from parent 2d753defe42e 3b07cb23c6ab Diff from another changeset...
-
.hgtags
-
doc/source/conf.py
-
i18n/tortoisehg/ca.po
-
i18n/tortoisehg/cs.po
-
i18n/tortoisehg/da.po
-
i18n/tortoisehg/de.po
-
i18n/tortoisehg/en_AU.po
-
i18n/tortoisehg/en_GB.po
-
i18n/tortoisehg/es.po
-
i18n/tortoisehg/et.po
-
i18n/tortoisehg/fa.po
-
i18n/tortoisehg/fr.po
-
i18n/tortoisehg/he.po
-
i18n/tortoisehg/hr.po
-
i18n/tortoisehg/hu.po
-
i18n/tortoisehg/it.po
-
i18n/tortoisehg/ja.po
-
i18n/tortoisehg/ko.po
-
i18n/tortoisehg/nb.po
-
i18n/tortoisehg/nl.po
-
i18n/tortoisehg/nn.po
-
i18n/tortoisehg/oc.po
-
i18n/tortoisehg/pl.po
-
i18n/tortoisehg/pt.po
-
i18n/tortoisehg/pt_BR.po
-
i18n/tortoisehg/ru.po
-
i18n/tortoisehg/sr.po
-
i18n/tortoisehg/sv.po
-
i18n/tortoisehg/tr.po
-
i18n/tortoisehg/uk.po
-
i18n/tortoisehg/zh_CN.po
-
i18n/tortoisehg/zh_TW.po
-
setup.py
-
tortoisehg/hgqt/backout.py
-
tortoisehg/hgqt/chunks.py
-
tortoisehg/hgqt/shelve.py
|
@@ -54,3 +54,4 @@ ee531052f78b11dafe1d8c7ab9cfb95b4854be38 2.0.1
5333ccf1184864720c1d3690df94fa47df80bf02 2.0.2
d5cd872f61fde0c1d1b279af4f3b90ff6ade3161 2.0.3
+26a8187ef879c83c2055044fa2080a640145d542 2.0.4
|
||
|
@@ -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.
|
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
@@ -79,6 +79,8 @@ 'contrib/win32',
'tortoisehg',
'tortoisehg/hgqt',
+ 'tortoisehg/hgtk',
+ 'tortoisehg/hgtk/logview',
'tortoisehg/util',
'tortoisehg/thgutil/iniparse',
]
|
||
|
@@ -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
|
||
|
@@ -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)
|
||
Add a tag
Loading...