On Sun, May 23, 2010 at 02:30:02PM -0700, David Wilhelm wrote:
> # HG changeset patch
> # User David Wilhelm <d...@jumbledpile.com>
> # Date 1274649010 25200
> # Node ID 06cbae45ed240fa289326b13641ec7aefa653330
> # Parent 91893ca137695dbc0b91962541b3c2c2c0f199c6
> shelve: fix shelve-backups for unshelve
>
> The backups were always skipped with the patch string position at the
> end instead of the beginning.
Update attached with better description, closing #1249.
# HG changeset patch
# User David Wilhelm <d...@jumbledpile.com>
# Date 1274649010 25200
# Node ID 9bd56a09f2cf73312e3c39f20d3acc216c428c60
# Parent 91893ca137695dbc0b91962541b3c2c2c0f199c6
shelve: fix shelve-backups for unshelve
The backups were always skipped since readline() was starting from the
end of the patch string.
Closes #1249
diff --git a/tortoisehg/util/hgshelve.py b/tortoisehg/util/hgshelve.py
--- a/tortoisehg/util/hgshelve.py
+++ b/tortoisehg/util/hgshelve.py
@@ -560,6 +560,7 @@
ui.status(fp.getvalue())
else:
files = []
+ fp.seek(0)
for chunk in parsepatch(fp):
if isinstance(chunk, header):
files += chunk.files()
------------------------------------------------------------------------------
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
