Adrian Buehlmann <adrian@cadifra.com> [Wed, 11 Jun 2008 13:51:57 +0200] rev 6673
update: improved help text
Using the term "the repository's working directory" instead of just "working
directory" to make it nearly impossible to confuse it with $PWD.
Also, this new wording better conveys the fact that update applies
to the working dir as a whole (no matter what the $PWD currently is).
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 02:27:06 +0200] rev 6672
keyword: mimic cmdutil.bail_if_changed even more
At the check before overwriting with kwexpand, kwshrink:
- abort when in middle of merge
- give terser abort message
Matt Mackall <mpm@selenic.com> [Fri, 13 Jun 2008 17:29:10 -0500] rev 6671
tag: record tag we're superseding, if any (issue 1102)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 13 Jun 2008 12:34:23 +0200] rev 6670
merge from crew-stable
Ali Saidi <saidi@eecs.umich.edu> [Fri, 13 Jun 2008 12:33:40 +0200] rev 6669
fix traceback in hgweb when URL doesn't end in one of the archive specs
If the last n charecters of the URL doesn't match an entry in archive_specs
req.form never has a key 'type'. When achive() looks up 'type' in the form
dict it causes a traceback rather than printing an error message.
Jason Orendorff <jorendorff@mozilla.com> [Thu, 12 Jun 2008 07:38:15 -0500] rev 6668
mq: qdiff: support all diffopts
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 11:01:36 +0200] rev 6667
keyword: disable expansion for annotate
Keyword expansion should not be annotated.
Annotate revision when unexpanded keyword was inserted.
Add test.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 12 Jun 2008 11:33:47 +0200] rev 6666
convert comments to docstrings in a bunch of extensions
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 12 Jun 2008 13:12:09 +0200] rev 6665
merge from crew-stable
Brendan Cully <brendan@kublai.com> [Thu, 12 Jun 2008 00:11:09 -0700] rev 6664
Truncate input to 1K when using pygments guess_lexer.
This function appears to be exponential with input length.
Andrew Beekhof <beekhof@gmail.com> [Thu, 12 Jun 2008 08:53:23 +0200] rev 6663
paper: fix reference to coal tags template
Brendan Cully <brendan@kublai.com> [Thu, 12 Jun 2008 00:11:09 -0700] rev 6662
Truncate input to 1K when using pygments guess_lexer.
This function appears to be exponential with input length.
Matt Mackall <mpm@selenic.com> [Wed, 11 Jun 2008 18:00:58 -0500] rev 6661
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com> [Wed, 11 Jun 2008 17:49:27 -0500] rev 6660
Merge with crew
Andrew Beekhof <beekhof@gmail.com> [Wed, 11 Jun 2008 14:49:53 +0200] rev 6659
webcommands: fix increments lost by 894875eae49b
Matt Mackall <mpm@selenic.com> [Tue, 10 Jun 2008 12:11:06 -0500] rev 6658
Merge with crew
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 07 Jun 2008 17:52:00 +0200] rev 6657
hgweb: show cset node and description when hovering over annotate prefix
Patrick Mezard <pmezard@gmail.com> [Sat, 07 Jun 2008 11:43:16 +0200] rev 6656
Merge with crew-stable
Johannes Stezenbach <js@sig21.net> [Tue, 03 Jun 2008 21:20:52 +0200] rev 6655
help: move "revision syntax" help topics into online help
Move the "Specifying Single Revisions" and "Specifying Multiple
Revisions" help topics from the manual page into the helptable
so they are available both online and in the manual page.
Johannes Stezenbach <js@sig21.net> [Tue, 03 Jun 2008 21:03:51 +0200] rev 6654
help: helptable is an ordered collection
The helptable is used for helptopics listed in the manual
page, so the order of topics should not be random.
Convert it from a dictionary into a tuple of tuples.
Also reorder helptable entries to keep previous manual
page order.
Johannes Stezenbach <js@sig21.net> [Tue, 03 Jun 2008 20:56:54 +0200] rev 6653
help: list special help topics with -v
Johannes Stezenbach <js@sig21.net> [Sat, 07 Jun 2008 09:49:34 +0200] rev 6652
help: enable listing of a subset of the command list
Instead of giving the "command %s is ambiguous" error message
with a bare list of possible command, display help list
for all commands starting with the given string.
Maxim Dounin <mdounin@mdounin.ru> [Wed, 07 May 2008 14:32:00 +0400] rev 6651
addremove: correctly handle intermediate symlinks
This fixes problems mentioned in issue660 comments (unrelated to original
issue) where directory was renamed, and symlink was added instead.
In such situation addremove wasn't able to correctly detect that old files
no longer here, but tried to add symlink (and failed due collision with
old files).
Patrick Mezard <pmezard@gmail.com> [Fri, 06 Jun 2008 18:31:57 +0200] rev 6650
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 06 Jun 2008 18:23:33 +0200] rev 6649
test-mq-qrename: test added patch renaming
Weijun Wang <weijun.wang@sun.com> [Fri, 06 Jun 2008 18:23:31 +0200] rev 6648
mq: handle added patch renaming correctly
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 05 Jun 2008 16:25:11 +0200] rev 6647
drop superfluous param from revlog.addgroup()
Matt Mackall <mpm@selenic.com> [Tue, 03 Jun 2008 15:41:09 -0500] rev 6646
copies: teach copies about dirstate.copies
When we're using copies() to find changes between the working directory and
its first parent for diff/status/etc., use dirstate.copies() directly.
This avoids doing a full statwalk for simple diffs (issue1090) and
removes a special case from the status command.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 03 Jun 2008 09:34:14 +0200] rev 6645
mq: introduce the qfinish command
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 03 Jun 2008 12:27:48 +0200] rev 6644
merge from crew-stable