##// END OF EJS Templates
tryimportone: use dirstateguard instead of beginparentchange/endparentchange...
tryimportone: use dirstateguard instead of beginparentchange/endparentchange To fix the issue that the recent (in memory) dirstate isn't visible to external process (e.g. "precommit" hook), a subsequent patch makes "localrepository.commit()" invoke "dirstate.write()" in it. This change will make "beginparentchange()" and "endparentchange()" on dirstate in "cmdutil.tryimportone()" meaningless, because: - "dirstate.write()" writes changed data into ".hg/dirstate", but - aborting between "beginparentchange()" and "endparentchange()" doesn't cause any restoring ".hg/dirstate" it just discards changes in memory. This patch uses "dirstateguard" instead of "beginparentchange()" and "endparentchange()" in "cmdutil.tryimportone()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch uses "lockmod.release(dsguard)" instead of "dsguard.release()", because processing may be aborted before assignment to "dsguard" , and the "if dsguard" examination for safety is redundant.

File last commit:

r18628:52305554 default
r24995:0579b0c2 default
Show More
changelogentry.tmpl
6 lines | 537 B | application/x-cheetah | CheetahLexer
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <h3 class="changelog"><a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a></h3>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <ul class="changelog-entry">
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <li class="age">{date|rfc822date}</li>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <li>by <span class="name">{author|obfuscate}</span> <span class="revdate">[{date|rfc822date}] rev {rev}</span></li>
Angel Ezquerra
hgweb: apply the websub filter to revision descriptions...
r18628 <li class="description">{desc|strip|escape|websub|addbreaks|nonempty}</li>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </ul>