##// END OF EJS Templates
merge: remove useless dirstate.normallookup() invocation in applyupdates()...
merge: remove useless dirstate.normallookup() invocation in applyupdates() Explicit 'dirstate.normallookup()' invocation via 'dirtysubstate()' in 'applyupdates()' is useless now, because previous patch fixed the relevant issue by writing in-memory dirstate changes out at the end of dirty check. 'dirstate.normallookup()' invocation was introduced by 6becb9dbca25 to avoid occasional test failure. This is partial backout of it (added tests are still left).

File last commit:

r13933:3d83c7d7 default
r25754:19cc443a default
Show More
map-cmdline.compact
12 lines | 460 B | text/plain | TextLexer
Augie Fackler
compact style: show bookmarks in the same manner as tags
r13933 changeset = '{rev}{tags}{bookmarks}{parents} {node|short} {date|isodate} {author|user}\n {desc|firstline|strip}\n\n'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 changeset_quiet = '{rev}:{node|short}\n'
changeset_verbose = '{rev}{tags}{parents} {node|short} {date|isodate} {author}\n {desc|strip}\n\n'
start_tags = '['
tag = '{tag},'
last_tag = '{tag}]'
start_parents = ':'
parent = '{rev},'
last_parent = '{rev}'
Augie Fackler
compact style: show bookmarks in the same manner as tags
r13933 start_bookmarks = '['
bookmark = '{bookmark},'
last_bookmark = '{bookmark}]'