Sat, 09 Oct 2010 11:35:31 +0100 Switch kwtemplater.record in kw_dorecord()
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:35:31 +0100] rev 819
Switch kwtemplater.record in kw_dorecord() Obsoletes the need for a global recordcommands variable.
Sat, 09 Oct 2010 11:35:24 +0100 Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:35:24 +0100] rev 818
Specific regular expressions depending on read mode More safeguarding against accidental (un)expansion: Reading filelog: act only on \$(kw1|kw2|..)\$ as keywords are always stored unexpanded. Reading wdir: act only on \$(kw1|kw2|..): [^$\n\r]*? \$ as we only are interested in expanded keywords in this situation. Note: we cannot use ..): [^$\n\r]+? \$ because e.g. the {branch} template might be empty. hg record is a special case as we read from the working directory and need one regex each for modified and added files. Therefore test recording an added file. This way we finally also forbid sequences like $Id: $ being treated as keywords.
Sat, 09 Oct 2010 11:34:55 +0100 test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:34:55 +0100] rev 817
test: remove remaining sed calls
Sat, 09 Oct 2010 11:34:39 +0100 disable expansion in kwfilelog.read() if file renamed in node
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.
Sat, 09 Oct 2010 11:33:38 +0100 Make iskwfile() a weeding method in lieu of a boolean
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.
Sat, 09 Oct 2010 11:33:12 +0100 Support copy and rename
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).
Sat, 09 Oct 2010 11:33:04 +0100 Refactor kwtemplater.overwrite()
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.
Fri, 01 Oct 2010 02:13:31 +0200 Use workingctx to detect modified and added files after rollback
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
Fri, 01 Oct 2010 02:13:31 +0200 Rename variable "cfiles" to "changed" for clarity
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Oct 2010 02:13:31 +0200] rev 811
Rename variable "cfiles" to "changed" for clarity
Sun, 26 Sep 2010 21:59:47 +0200 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 21:59:47 +0200] rev 810
Merge with default
Sun, 26 Sep 2010 19:18:41 +0200 Support rollback by restoring expansion to previous values
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.
Sun, 26 Sep 2010 19:18:41 +0200 Do not expand at all during diff
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.
Sun, 26 Sep 2010 19:18:41 +0200 Restore restricted read mode value after overwriting
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 807
Restore restricted read mode value after overwriting Even though just enforcing expansion after overwriting files in the working directory caused no problems that we know of, this avoids a potential source of problems (e.g. in collaboration other extensions) at no costs.
Sun, 26 Sep 2010 19:18:41 +0200 test: fix typo, rephrase
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 806
test: fix typo, rephrase
Thu, 23 Sep 2010 17:03:23 +0200 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Sep 2010 17:03:23 +0200] rev 805
Merge with default
(0) -300 -100 -15 +15 +100 +300 tip