Nathan Durnan committed 9d03d15 Merge

Merge with hotfixes

  • Participants
  • Parent commits 0604f56, a261eb9
  • Tags Version 0.0.4

Comments (0)

Files changed (1)

 #	 methods failed to work with the version of TortoiseHg used for development 
 #	(v2.0.4).  Ideally, this will be revised to a cleaner method in the future.
-def Wrap_Commit(repo, text="", user=None, date=None, myMatch=None, force=False, editor=False, extra={}):
+def Wrap_Commit(repo, text="", user=None, date=None, match=None, force=False, editor=False, extra={}):
 	repo.ui.debug('Wrap_Commit accessed!\n')
 	#Check for a merge-commit. 
 	#  Don't run timestamp code on merge.
 		repo.ui.status('Wrap_Commit aborted - Merge in progress')
 		# Make sure the match object is created.
-		if not myMatch:
-			myMatch = match.always('')
+		if not match:
+			match = match.always('')
 		# End of check for non-existent match object.
-		List_CommitMatch = myMatch.files() + [File_TimestampRecords]
+		List_CommitMatch = match.files() + [File_TimestampRecords]
 		timestamp_mod(repo.ui, repo, **dict({'save': True, 'restore': None}))
 		# Make sure record file is part of repository and commit. 
 		if not File_TimestampRecords in repo.dirstate:
 		#Update match fileset for use under TortoiseHg.
 		#  TortoiseHg doesn't seem to catch the updated file
 		#  unless it is manually added to the match fileset.
-		if File_TimestampRecords in myMatch.files():
+		if File_TimestampRecords in match.files():
 			# Don't need to do anything if record file already in commit.
 			repo.ui.debug('Wrap_Commit: ', File_TimestampRecords, ' already in match\n')
 			# Add the record file to the match object.
-			myMatch.files().append(File_TimestampRecords)
+			match.files().append(File_TimestampRecords)
 		# end of check for record file.
-		repo.ui.debug('Match Files: ', str(myMatch.files()), '\n')
+		repo.ui.debug('Match Files: ', str(match.files()), '\n')
 	#end of check for merge-commit.
-	return repo.timestamp_origcommit(text, user, date, myMatch, force, editor, extra)
+	return repo.timestamp_origcommit(text, user, date, match, force, editor, extra)
 #_ end of Wrap_Commit _________________________________________________________