Nathan Durnan avatar Nathan Durnan committed 7fede0e Merge

Merge with Release 0.2.5

Comments (0)

Files changed (3)

 ".hgignore": {"timestamp": 1336516662.38},
 ".hgtags": {"timestamp": 1339170736.2},
-"": {"timestamp": 1339170145.3},
+"": {"timestamp": 1339691478.75},
 "TimeStampMod.png": {"timestamp": 1305052883.0},
-"": {"timestamp": 1339114719.52},
+"": {"timestamp": 1339691056.98},
 "TimeStampMod.xmind": {"timestamp": 1306451621.66},
 "TimestampMod_LastRecord": {"timestamp": 0}
 These release notes will not cover every version, just tip of the repository and previous major release points.
-### __0.2.4 (beta)__ - _June 7, 2012_
+### __0.2.5 (beta)__ - _June 14, 2012_
 This is a bug-fix release.  
     _(fixed in TimestampMod v0.2.3)_
     * Timestamps were not restored when 'hg revert' was used with a folder name.  The extension was attempting to treat the folder name as a reverted file, but could not find the timestamp data for it.  The extension now distinguishes between reverting files and reverting folders and applies timestamps to the files within a reverted folder.  
     _(fixed in TimestampMod v0.2.4)_
+    * Exception error occurred when using TimestampMod with older versions of MQ patch queue extension.  The MQ 'qrefresh' was calling commit with match.files() as set() instead of list().  The TimestampMod extension now coerces the match.files() object to a list to avoid this issue.  
+    _(fixed in TimestampMod v0.2.5)_
 ### __0.2.2 (beta)__ - _April 26, 2012_
 This is a feature change beta release.  The format of the timestamp file (.hgtimestamp) has changed with this release in order to be more forward-compatible.  
 # end help text
 # - Automatically save and restore the modification times of files
-File_Version = '0.2.4'	# Version number definition
+File_Version = '0.2.5'	# Version number definition
 # --> !!BETA RELEASE!!! <--
 # Copyright 2011-2012 Nathan Durnan <>
 #	recorded and restored during commit, update, revert, etc. operations.
 # Development information:
-#	Mercurial Version:	1.8.3 - 2.2.1 (from TortoiseHg package)
+#	Mercurial Version:	1.8.3 - 2.2.2 (from TortoiseHg package)
 #	Python Version:		2.6.6 (from TortoiseHg package)
-#	TortoiseHg Version: 2.0.4 - 2.4.0
+#	TortoiseHg Version: 2.0.4 - 2.4.1
 		# End of check for non-existent match object.
-		myList_Match = list()
+		# Make sure match.files is a list, not a set or other type.
+		if not isinstance(match.files(), list):
+			#coerce files() to a list object.
+			match._files = list(match.files())
+		#end of check for list type
 		myList_Match = match.files() #don't add timestamp file here, it will be added later.
 		timestamp_mod(repo.ui, repo, **dict({'save': True, 'restore': None, 'match': myList_Match}))
 		# Make sure record file is part of repository and commit. 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.