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
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 08 Oct 2010 18:00:15 -0500] rev 12622
changegroupsubset: use readdelta() fast path when delta is against a parent
Patrick Mezard <pmezard@gmail.com> [Fri, 08 Oct 2010 17:00:38 -0500] rev 12621
run-tests: handle .tst not ending with an LF
Martin Geisler <mg@lazybytes.net> [Fri, 08 Oct 2010 22:42:32 +0200] rev 12620
minirst: small code cleanup
Brodie Rao <brodie@bitheap.org> [Fri, 08 Oct 2010 14:02:23 -0500] rev 12619
cat: fix cat without -r, broken by 0ae35296fbf4
The default revision for revsingle() is now '.' instead of None. This
preserves the behavior of cat prior to it using revsingle().
Matt Mackall <mpm@selenic.com> [Thu, 07 Oct 2010 18:24:29 -0500] rev 12618
revsets: introduce revsingle helper
revsingle returns a context for the last revision of the supplied revspec
Matt Mackall <mpm@selenic.com> [Thu, 07 Oct 2010 18:05:04 -0500] rev 12617
revsets: make revpair revsets-aware
revpair returns the first and last members of the computed revset(s)
Matt Mackall <mpm@selenic.com> [Thu, 07 Oct 2010 11:45:17 -0500] rev 12616
revset: lower precedence of minus infix (issue2361)
Henrik Stuart <hg@hstuart.dk> [Tue, 05 Oct 2010 20:25:51 +0200] rev 12615
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Tue, 05 Oct 2010 11:34:13 +0200] rev 12614
revset: fix #branch in urls for outgoing()
hg log -r 'outgoing(..)' ignored #branch in some cases.
This patch fixes it.
The cases where it misbehaved are now covered by the added
test-revset-outgoing.t
Martin Geisler <mg@lazybytes.net> [Fri, 01 Oct 2010 23:16:11 +0200] rev 12613
heads: mention STARTREV in synopsis and help for --rev
Before this change, "hg help heads" said
hg heads [-ac] [-r REV] [REV]...
[...]
If STARTREV is specified, only those heads that are descendants
of STARTREV will be displayed.
[...]
-r --rev REV show only heads which are descendants of REV
[...]
which made little sense since there are two things called REV in the
synopsis and nothing called STARTREV.
A little digging reveals that the "[-r REV]" part of the synopsis was
introduced in 8e503fa54d2d, changed to "[-r STARTREV]" in
2bcef677a6c3, and then changed back to "[-r REV]" in 4b02fc71bbba.
The last change seems to be based on a patch[1] on our mailinglist
that actually *inserted* STARTREV again in the help for the command
line option itself. For some reason, the patch was changed to remove
STARTREV from the synopsis.
This change finally makes the help consistent by putting STARTREV back
into the help in all places where it is needed:
hg heads [-ac] [-r STARTREV] [REV]...
[...]
If STARTREV is specified, only those heads that are descendants
of STARTREV will be displayed.
[...]
-r --rev STARTREV show only heads which are descendants of STARTREV
[...]
This was not possible until 40c06bbf58be, which introduced the
possibility of naming the meta variables for each option.
[1]: http://mercurial.markmail.org/message/qgc55gd4fam4ogvz
Matt Mackall <mpm@selenic.com> [Fri, 01 Oct 2010 10:29:33 -0500] rev 12612
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Oct 2010 10:18:57 -0500] rev 12611
Added signature for changeset 93d8bff78c96
Matt Mackall <mpm@selenic.com> [Fri, 01 Oct 2010 10:18:53 -0500] rev 12610
Added tag 1.6.4 for changeset 93d8bff78c96
Matt Mackall <mpm@selenic.com> [Fri, 01 Oct 2010 10:16:52 -0500] rev 12609
merge with i18n
Adrian Buehlmann <adrian@cadifra.com> [Fri, 01 Oct 2010 16:10:06 +0200] rev 12608
tests: unify test-rebase*
Martin Geisler <mg@aragost.com> [Fri, 01 Oct 2010 16:43:03 +0200] rev 12607
merge with stable
Martin Geisler <mg@aragost.com> [Fri, 01 Oct 2010 16:39:55 +0200] rev 12606
test-url: refactor with shorter lines
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Oct 2010 02:13:31 +0200] rev 12605
keyword: use workingctx to detect modified and added files after rollback
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Oct 2010 02:13:31 +0200] rev 12604
keyword: rename variable "cfiles" to "changed" for clarity
Brodie Rao <brodie@bitheap.org> [Mon, 27 Sep 2010 13:13:34 -0500] rev 12603
tests: unify test-casefolding
Martin Geisler <mg@aragost.com> [Fri, 01 Oct 2010 16:08:46 +0200] rev 12602
url: mark certificate error string for translation
Wagner Bruna <wbruna@yahoo.com> [Fri, 01 Oct 2010 11:15:19 -0300] rev 12601
i18n-pt_BR: synchronized with f2937d6492c5
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 01 Oct 2010 11:15:10 -0300] rev 12600
merge with i18n stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Oct 2010 17:24:18 +0900] rev 12599
i18n-ja: synchronized with e356c5c21b15
Matt Mackall <mpm@selenic.com> [Thu, 30 Sep 2010 19:10:19 -0500] rev 12598
merge with stable