Matt Mackall <mpm@selenic.com> [Fri, 08 Oct 2010 20:12:40 -0500] rev 12638
keyword: fix test glob
Brodie Rao <brodie@bitheap.org> [Mon, 04 Oct 2010 15:07:12 -0500] rev 12637
dispatch: properly handle relative path aliases used with -R (
issue2376)
This ensures the repo config is read relative to the repo root during
dispatch.
Brodie Rao <brodie@bitheap.org> [Mon, 04 Oct 2010 14:26:38 -0500] rev 12636
dispatch: remove superfluous try/except when reading local ui config
ui.readconfig() already handles IOError in this case.
Brodie Rao <brodie@bitheap.org> [Mon, 04 Oct 2010 14:26:37 -0500] rev 12635
test-globalopts: test hg -R file:// and hg -R path-alias
Eduard-Cristian Stefan <alexandrul.ct@gmail.com> [Wed, 06 Oct 2010 23:07:52 +0300] rev 12634
hgk: remember main window position
Steve Losh <steve@stevelosh.com> [Fri, 08 Oct 2010 16:10:00 -0400] rev 12633
alias: back up and restore commands.norepo before checking for shell aliases
Brodie Rao <brodie@bitheap.org> [Fri, 08 Oct 2010 16:08:46 -0500] rev 12632
tests: unify test-check-code
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Oct 2010 18:39:46 +0100] rev 12631
keyword: switch kwtemplater.record in kw_dorecord()
Obsoletes the need for a global recordcommands variable.
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Oct 2010 18:39:46 +0100] rev 12630
keyword: 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.
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Oct 2010 18:39:46 +0100] rev 12629
test-keyword: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Oct 2010 18:39:46 +0100] rev 12628
keyword: 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> [Fri, 08 Oct 2010 18:39:46 +0100] rev 12627
keyword: make iskwfile() a weeding method in lieu of a boolean
Update iskwfile docstring.
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Oct 2010 18:39:46 +0100] rev 12626
keyword: 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> [Fri, 08 Oct 2010 18:39:46 +0100] rev 12625
keyword: 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.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 08 Oct 2010 18:00:19 -0500] rev 12624
revlog.addgroup(): always use _addrevision() to add new revlog entries
This makes parentdelta clone support pulling.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 08 Oct 2010 18:00:16 -0500] rev 12623
revlog._addrevision(): allow text argument to be None, build it lazily