Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:34:55 +0100] rev 817
test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:34:39 +0100] rev 816
disable expansion in kwfilelog.read() if file renamed in node
Simplifies kwfilelog.cmp() and avoids fiddling with/importing revlog.
Reorder imports alphabetically.
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:33:38 +0100] rev 815
Make iskwfile() a weeding method in lieu of a boolean
Update iskwfile docstring.
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:33:12 +0100] rev 814
Support copy and rename
copy/rename destinations being unversioned and possibly ignored by
the extension should not contain expanded keywords.
Files copied/renamed from an ignored source are not touched.
Add tests covering both of the above cases, plus the corner case of
cp symlink foo; hg cp -A symlink foo (where foo becomes a regular file).
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:33:04 +0100] rev 813
Refactor kwtemplater.overwrite()
Make kwexpand, kwshrink restricted commands - i.e. read from
filelog without expansion for substition in kwtemplater.overwrite,
and set/unset restricted mode for overwrite() in in kwcommitctx
and the dorecord wrapper.
Preselect candidates when working on changed files (rollback, record)
outside kwtemplater class, and remove 6th argument from overwrite().
Avoid duplicate substitution/search in overwrite():
Only go into restricted read mode when reading from filelog.
rollback and record read from the working directory, where
restricted mode would already shrink keywords before overwrite()
either expands or shrinks them again.
This ensures that the usual automatic operations on keywords
are turned off during overwrite() and only overwrite() itself
acts on them.
Reduce manifest calculation to the cases where it is needed.
Move helper function for expansion removal outside kwtemplater class.
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Oct 2010 02:13:31 +0200] rev 812
Use workingctx to detect modified and added files after rollback
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Oct 2010 02:13:31 +0200] rev 811
Rename variable "cfiles" to "changed" for clarity
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 21:59:47 +0200] rev 810
Merge with default
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 809
Support rollback by restoring expansion to previous values
Prevent spurious differences in the working directory
after a rollback.
Add tests for several rollback situations.
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 808
Do not expand at all during diff
Always shrink and never expand keywords during a diff operation.
Avoid user distraction e.g. because of spurious differences
appearing in the commit editor.