Matt Mackall <mpm@selenic.com> [Wed, 23 Mar 2011 09:20:40 -0500] rev 13728
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 22 Mar 2011 21:27:51 -0500] rev 13727
debugbundle: fix up long line caught by check-code
Matt Mackall <mpm@selenic.com> [Tue, 22 Mar 2011 21:26:19 -0500] rev 13726
wireproto: avoid naked excepts
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Tue, 15 Mar 2011 14:55:16 +0100] rev 13725
mq: fix typo in docstring
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 22 Mar 2011 09:22:29 +0100] rev 13724
commands: add debugbundle command
Lists ids contained in a bundle file. Useful for testing bundle-related commands.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 22 Mar 2011 09:22:21 +0100] rev 13723
wireproto: add known([id]) function
known([Node]) -> [1/0]
Returns 1/0 for each node, indicating whether it's known by the server.
Needed for new discovery protocols introduced in later patches.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 22 Mar 2011 07:40:02 +0100] rev 13722
wireproto: fix decodelist to properly return empty list
Needed by tests for next patch introducing known().
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 22 Mar 2011 07:38:32 +0100] rev 13721
wireproto: fix handling of '*' args for HTTP and SSH
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 22 Mar 2011 07:38:32 +0100] rev 13720
debug: add debugwireargs to test argument passing over the wire
Tests argument passing locally, via HTTP, and via SSH. This is mainly preparation
for the next patch.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 22 Mar 2011 07:37:56 +0100] rev 13719
sshserver: drop unnecessary line
Matt Mackall <mpm@selenic.com> [Tue, 22 Mar 2011 12:00:38 -0500] rev 13718
merge: avoid unlinking destination of merge when case changes (issue2715)
Matt Mackall <mpm@selenic.com> [Tue, 22 Mar 2011 11:59:43 -0500] rev 13717
dirstate: introduce a public case normalizing method
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 20:25:41 -0500] rev 13716
changegroup: minor cleanups
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 20:21:19 -0500] rev 13715
repair: revlog has an iterator
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 20:17:57 -0500] rev 13714
changegroup: fix leftover from delta read
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 20:16:51 -0500] rev 13713
changegroup: drop expensive redundant usage of readdelta for progress
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13712
changegroupsubset: use manifest.readfast to simplify collector
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13711
manifest: add readfast method
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13710
changegroupsubset: simplify filenode_collector
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13709
changegroupsubset: more renaming
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13708
changegroupsubset: simplify prune
Ancestors of nodes linked to commonrevs can be expected to be linked
to commonrevs. Walking graphs of each revlog looking for rare/nonexistent outliers is overkill.
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13707
changegroupsubset: more minor cleanups
- remove more excessive comments
- simplify some sorting operations
- rename some variables
- replace identity with a lambda
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13706
changegroupsubset: minor cleanups
- move some variable declarations
- drop some excessive comments
- use standard variable naming
Matt Mackall <mpm@selenic.com> [Sun, 20 Mar 2011 19:43:28 -0500] rev 13705
strip: simplify collectone
Greg Ward <greg@gerg.ca> [Sun, 20 Mar 2011 17:41:09 -0400] rev 13704
dirstate: avoid a race with multiple commits in the same process
(issue2264, issue2516)
The race happens when two commits in a row change the same file
without changing its size, *if* those two commits happen in the same
second in the same process while holding the same repo lock. For
example:
commit 1:
M a
M b
commit 2: # same process, same second, same repo lock
M b # modify b without changing its size
M c
This first manifested in transplant, which is the most common way to
do multiple commits in the same process. But it can manifest in any
script or extension that does multiple commits under the same repo
lock. (Thus, the test script tests both transplant and a custom script.)
The problem was that dirstate.status() failed to notice the change to
b when localrepo is about to do the second commit, meaning that change
gets left in the working directory. In the context of transplant, that
means either a crash ("RuntimeError: nothing committed after
transplant") or a silently inaccurate transplant, depending on whether
any other files were modified by the second transplanted changeset.
The fix is to make status() work a little harder when we have
previously marked files as clean (state 'normal') in the same process.
Specifically, dirstate.normal() adds files to self._lastnormal, and
other state-changing methods remove them. Then dirstate.status() puts
any files in self._lastnormal into state 'lookup', which will make
localrepository.status() read file contents to see if it has really
changed. So we pay a small performance penalty for the second (and
subsequent) commits in the same process, without affecting the common
case. Anything that does lots of status updates and checks in the
same process could suffer a performance hit.
Incidentally, there is a simpler fix: call dirstate.normallookup() on
every file updated by commit() at the end of the commit. The trouble
with that solution is that it imposes a performance penalty on the
common case: it means the next status-dependent hg command after every
"hg commit" will be a little bit slower. The patch here is more
complex, but only affects performance for the uncommon case.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 20 Mar 2011 01:16:57 +0100] rev 13703
changegroupsubset: extranodes are no longer needed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 20 Mar 2011 00:50:22 +0100] rev 13702
strip: remove usage of extranodes
Instead of computing the exact set of missing revlog revisions, we only
compute the set of missing/broken changesets. The resulting bundle can be
slightly bigger but we will be able to get rid of the ugly extranodes handling
in changegroupsubset.
Patrick Mezard <pmezard@gmail.com> [Sun, 20 Mar 2011 00:22:47 +0100] rev 13701
patch: move closefile() into patchfile.close()
Patrick Mezard <pmezard@gmail.com> [Sun, 20 Mar 2011 00:09:44 +0100] rev 13700
patch: inline patchfile.hashlines()
Patrick Mezard <pmezard@gmail.com> [Sun, 20 Mar 2011 00:08:44 +0100] rev 13699
patch: fix hunk newlines when parsing hunks, not in iterhunks()
Patrick Mezard <pmezard@gmail.com> [Sat, 19 Mar 2011 19:50:55 +0100] rev 13698
i18n: register new template keywords for translation
Matt Mackall <mpm@selenic.com> [Sat, 19 Mar 2011 01:34:49 -0500] rev 13697
annotate: catch nonexistent files using match.bad callback (issue1590)
Steve Borho <steve@borho.org> [Fri, 18 Mar 2011 13:01:18 -0500] rev 13696
merge with stable
Steve Borho <steve@borho.org> [Fri, 18 Mar 2011 11:36:36 -0500] rev 13695
wix: add new file templates/paper/bookmarks.tmpl
This file was snuck onto the stable branch with 38c9837b1f75
Matt Mackall <mpm@selenic.com> [Thu, 17 Mar 2011 17:08:13 -0500] rev 13694
merge with stable
Miloš Hadžić <milos.hadzic@gmail.com> [Thu, 17 Mar 2011 22:55:02 +0100] rev 13693
push/outgoing: print remote target path even if there's an error (issue2561)
This is a simple patch to make hg push/hg outgoing print their remote target
path even if the operation fails. I'm not sure if the original behavior was by
design.
This patch also changes one test to reflect the changed behaviour.
Eric Eisner <ede@mit.edu> [Thu, 17 Mar 2011 16:29:09 -0400] rev 13692
subrepo: recognize scp-style paths as git URLs
Patrick Mezard <pmezard@gmail.com> [Thu, 17 Mar 2011 22:17:27 +0100] rev 13691
convert: add svnrev, svnpath and svnuuid template keywords
$ hg -R A-hg log --template '{rev} {svnuuid}{svnpath}@{svnrev}\n'
10 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@10
Patrick Mezard <pmezard@gmail.com> [Thu, 17 Mar 2011 22:17:27 +0100] rev 13690
convert/svn: extract revsplit() in a function
Patrick Mezard <pmezard@gmail.com> [Thu, 17 Mar 2011 22:17:27 +0100] rev 13689
transplant: add "transplanted" keyword
$ hg log --template '{rev} {transplanted}\n'
7 a53251cdf717679d1907b289f991534be05c997a
Matt Mackall <mpm@selenic.com> [Thu, 17 Mar 2011 12:00:49 -0500] rev 13688
merge with i18n
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 17:43:43 +0100] rev 13687
i18n: merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 17:42:42 +0100] rev 13686
i18n-da: synchronize with e9628665b670
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 17:38:25 +0100] rev 13685
i18n: don't mark trivial string for translation
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 17:34:13 +0100] rev 13684
i18n: merge with mpm
David Soria Parra <dsp@php.net> [Tue, 15 Mar 2011 10:39:19 +0100] rev 13683
i18n-de: correct translation for some fuzzy strings
David Soria Parra <dsp@php.net> [Tue, 15 Mar 2011 10:20:55 +0100] rev 13682
i18n-de: synchronize with 994510694b1d
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 15:35:23 +0100] rev 13681
i18n-de: added translations concerning hardlinks
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 15:18:17 +0100] rev 13680
i18n-de: added more translations concerning rebase
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 14:16:15 +0100] rev 13679
i18n-de: added translations concerning rebase
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 13:04:06 +0100] rev 13678
i18n-de: added translations concerning email sending
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 12:52:22 +0100] rev 13677
i18n-de: added translations concerning patches
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 12:21:46 +0100] rev 13676
i18n-de: added translations concerning win32text and .hgeol
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 11:38:27 +0100] rev 13675
i18n-de: added translations for Perforce conversion options
thron7 <thron7@users.sourceforge.net> [Sat, 12 Mar 2011 18:54:43 +0100] rev 13674
i18n-de: added translations for Subversion conversion options
thron7 <thron7@users.sourceforge.net> [Sat, 12 Mar 2011 18:32:02 +0100] rev 13673
i18n-de: added translation for CVS conversion options
thron7 <thron7@users.sourceforge.net> [Sat, 12 Mar 2011 17:42:17 +0100] rev 13672
i18n-de: added translations for convert.hg.* options
thron7 <thron7@users.sourceforge.net> [Sat, 12 Mar 2011 17:42:17 +0100] rev 13671
i18n-de: translate some strings
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Wed, 16 Mar 2011 23:54:55 +0100] rev 13670
revset: fix a number of highly dubious continue statements
This patch definitely needs a review and would also benefit from
some new testsuite entries.
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Wed, 16 Mar 2011 23:54:55 +0100] rev 13669
graphlog: do not swallow all TypeError exceptions (fix 29c800ee54cf)
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Wed, 16 Mar 2011 23:54:55 +0100] rev 13668
archive: use hardcoded constants when creating .zip archives
Do not rely on local stat constants, which may differ.
timeless <timeless@gmail.com> [Wed, 16 Mar 2011 03:06:57 +0100] rev 13667
hgweb: support multiple directories for the same path
[paths]
/dir = /path/1/*, /path/2/*
timeless <timeless@gmail.com> [Wed, 16 Mar 2011 03:28:56 +0100] rev 13666
templates: provide granularity for future values for age filter
Bernhard Leiner <bleiner@gmail.com> [Wed, 16 Mar 2011 23:09:14 +0100] rev 13665
revset: report a parse error if a revset is not parsed completely (issue2654)
Adrian Buehlmann <adrian@cadifra.com> [Wed, 16 Mar 2011 18:48:59 +0100] rev 13664
config: use util.posixfile
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 23:03:56 +0100] rev 13663
bundle: update current bookmark to most recent revision on current branch
We check if the current bookmark is set to the first parent of the
dirstate. Is this the case we move the bookmark to most recent revision
on the current branch (where hg update will update you to).
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 20:53:55 +0100] rev 13662
localrepo: do not update bookmarks in addchangegroup
We want to update the current bookmark to the most recent revision on
current branch unless there is a remote bookmark that points to
a different descendant. Addchangegroup is called before we can check for
remote bookmarks.
We don't update the bookmark in addchangegroup anymore to allow proper updating
of bookmarks in pull.
Radomir Dopieralski <sheep@stxnext.pl> [Tue, 15 Mar 2011 18:33:36 +0100] rev 13661
rebase: add -m/--message to rebase --collapse (issue2389)
When collapsing changesets with rebase, you get a chance to edit the commit
message manually, but there is no way to pass this message from the command
line. This patch adds a `--message` (with short form `-m`) and `--logfile`
(with short form `-m`) options to the rebase command. These options suppresses
the generation of the default commit message, and instead use the message
provided in the option (in case of `-m`) or in the file it points to (in case
of `-l`).
If you use this option without the `--collapse` option, it will raise an
error.
Options documentation edited by Patrick Mezard <pmezard@gmail.com>
David Wolever <david@wolever.net> [Tue, 15 Mar 2011 17:50:02 -0400] rev 13660
Updating hgext.extdiff to use revsets
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 16:07:06 +0100] rev 13659
merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 15:34:45 +0100] rev 13658
relink: mark abort message for translation
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 15:34:10 +0100] rev 13657
relink: avoid trying to lock the same repo twice
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 13:51:47 +0100] rev 13656
relink: format reclaimed byte count nicely
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 13:25:12 +0100] rev 13655
test-relink: remove unnecessary ui.username setting
David Soria Parra <dsp@php.net> [Wed, 16 Mar 2011 09:05:59 +0100] rev 13654
test-https: match output from 31eac42d9123
Matt Mackall <mpm@selenic.com> [Tue, 15 Mar 2011 16:53:46 -0500] rev 13653
merge with stable
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 22:37:50 +0100] rev 13652
merge with crew
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 21:35:31 +0100] rev 13651
convert/svn: fix _iterfiles() output in root dir case (issue2647)
When converting directory additions/replacement with project directory set to
root, _iterfiles() sometimes returned paths starting with a slash making
following svn calls to fail.
I could not reproduce the issue with hand-crafted repositories.
Report and first analysis by Clinton Chau <clinton@clearcanvas.ca>
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 21:31:54 +0100] rev 13650
eol: no need to accumulate files when checking all changesets
Just check the files touched by the changesets.
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 21:08:18 +0100] rev 13649
eol: improve hook failure output
Before, only the first failure was reported:
abort: b.txt should not have CRLF line endings
while now all of them are listed:
abort: end-of-line check failed:
d.txt in a7040e68714f should not have CRLF line endings
b.txt in fbcf9b1025f5 should not have CRLF line endings
As first suggested by Antoine Pitrou <solipsis@pitrou.net>
Matt Mackall <mpm@selenic.com> [Mon, 14 Mar 2011 15:59:44 -0500] rev 13648
merge with stable
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 09:36:17 +0100] rev 13647
bookmarks: remove API limitation in setcurrent
setcurrent refuses to set a new current bookmark if the current bookmark
points to the current dirstate. This restriction is not needed. A current
bookmark can point to a different bookmark.
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 00:10:43 +0100] rev 13646
bookmarks: separate bookmarks update code from localrepo's pull.
We explicitly want to update bookmarks from a remote. This will avoid
duplicate calls to listkeys if we clone (which calls pull) and keep
bookmark related code together.
David Soria Parra <dsp@php.net> [Sun, 13 Mar 2011 14:35:17 +0100] rev 13645
tests: add tests for bookmarks support in hg identify
Nils Adermann <naderman@naderman.de> [Sat, 12 Mar 2011 18:15:14 +0100] rev 13644
identify: list bookmarks for remote repositories
Craig Leres <leres@ee.lbl.gov> [Mon, 14 Mar 2011 12:42:05 -0400] rev 13643
hgignore: ignore dll files generated under cygwin
Brodie Rao <brodie@bitheap.org> [Tue, 04 Jan 2011 00:24:34 +1100] rev 13642
pager: don't page stderr if it's being redirected (issue2541)
Adrian Buehlmann <adrian@cadifra.com> [Fri, 11 Mar 2011 11:14:21 +0100] rev 13641
color: port to using ctypes (issue2687)
replacing usage of pywin32, which was removed for Mercurial 1.8
Matt Mackall <mpm@selenic.com> [Mon, 14 Mar 2011 15:28:56 -0500] rev 13640
hgweb: drop use of super() for Exception base class
In Python 2.4, Exception is an old-style class and doesn't work with super.
Steve Borho <steve@borho.org> [Mon, 14 Mar 2011 13:11:26 -0500] rev 13639
diff: make diff -c aware of revision sets
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 15:19:58 +0100] rev 13638
color: wrap lines in docstring
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 14:05:19 +0100] rev 13637
merge with stable
Jon M. Dugan <jdugan@x1024.net> [Sun, 13 Mar 2011 17:39:33 -0500] rev 13636
setup: fix mac build broken by e42d18538e1d
Sometimes xcodebuild prints warnings to stderr, but runcmd() assumes anything
printed to stderr implies failure. Since runcmd() was originally only
intended to run hg, this was fine until it was pressed into service for
running xcodebuild. Thus: split runcmd() into two parts: runcmd(), which does
the minimal amount of work to run a subprocess, and runhg(), which calls
runcmd().
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 13:54:25 +0100] rev 13635
color: don't mention internal function in docstring
The render_text function actually never existed, the docstring
probably meant the render_effects function instead.
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Mar 2011 12:26:50 +0100] rev 13634
keyword: offer additional datefilters when the extension is enabled
Before the additional datefilters (utcdate, svnisodate, svnutcdate)
were used when kwtemplater was initialized. Now they always be used
once the extension is enabled.
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Mar 2011 12:19:59 +0100] rev 13633
keyword: docstrings for additional date filters
Martin Geisler <mg@lazybytes.net> [Sun, 13 Mar 2011 16:18:46 +0100] rev 13632
mq: do not let qrefresh write bad patch
Klaus Koch <kuk42@gmx.net> [Sun, 13 Mar 2011 15:04:13 +0100] rev 13631
graphlog: give meaningful error if more than one file is given
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 09:20:21 +0100] rev 13630
merge with stable
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 09:20:05 +0100] rev 13629
test-https: update to match output from 3f6a4579f803
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 00:10:43 +0100] rev 13628
tests: respect new hg clone listkey queries in http-proxy test
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 14:36:47 +0100] rev 13627
bookmarks: discard current bookmark if absent from the bookmarks (issue2692)
After a rollback, the current bookmark might be absent from the bookmarks
file. In that case we discard it instead of displaying a traceback during
commit.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 16:13:25 +0100] rev 13626
fix test-highlight after bookmark support change for hgweb
Steve Borho <steve@borho.org> [Sun, 13 Mar 2011 10:09:30 -0500] rev 13625
merge with stable
Steve Borho <steve@borho.org> [Sun, 13 Mar 2011 10:03:06 -0500] rev 13624
eol: do not abort when win32text is found, only warn
The win32text extension does not break eol or vice-versa, so it is not a fatal
error to have both of them enabled. It's just folly. So spewing warnings in
this condition is preferrable to aborting. When both extensions are enabled,
the user now sees:
% hg st
the eol extension is incompatible with the win32text extension
win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension
M hgext/eol.py
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 15:59:50 +0100] rev 13623
merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 13 Mar 2011 15:59:24 +0100] rev 13622
tests: fix failures introduced in 7359cb753a54
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Mar 2011 11:06:40 +0100] rev 13621
tests: fix permission issue trying to remove test directory
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 15:42:24 +0100] rev 13620
bookmarks: fix update of the current bookmark during rename
We need to get rid of the previous bookmark after changing current bookmark.
Steve Borho <steve@borho.org> [Sun, 13 Mar 2011 08:50:06 -0500] rev 13619
setup: remove unnecessary code for win32com (pywin32)
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:10:01 +0100] rev 13618
test-highlight: fix test output (introduced by 2151703e7f84)
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13617
eol: rename hook into checkheadshook, add checkallhook (issue2665)
"hook" is still an alias for "checkheadshook".
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13616
eol: make the hook check all new heads, not only tip (issue2666)
Report and test by Antoine Pitrou <solipsis@pitrou.net>
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13615
eol: the hook no longer requires the extension to be loaded
Reading rules in the hook means we no longer need ui to be filled and do not
need reposetup() to be run anymore.
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13614
eol: extract parsing error handling in parseeol()
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13613
eol: separate .hgeol parsing from merge in ui
This will help refactoring the hook.
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13612
eol: remove unused argument in readhgeol()
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13611
eol: explain why reading .hgeol from the working dir is special
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 13 Mar 2011 14:26:32 +0100] rev 13610
templates: widen the graph canvas (issue2683)
Martin Geisler <mg@lazybytes.net> [Sun, 13 Mar 2011 13:52:47 +0100] rev 13609
rebase: don't use util.Abort for an internal error
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 13 Mar 2011 13:38:44 +0100] rev 13608
help: limit documentation width to at most 80 characters
Reading long lines is suboptimal no matter how wide the terminal is.
Martin Geisler <mg@lazybytes.net> [Sun, 13 Mar 2011 13:05:16 +0100] rev 13607
merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 13 Mar 2011 12:44:35 +0100] rev 13606
transplant: avoid the word "rebase" when we mean "transplant"
Martin Geisler <mg@lazybytes.net> [Sun, 13 Mar 2011 12:43:52 +0100] rev 13605
transplant: explain that changesets are copied, not moved
David Soria Parra <dsp@php.net> [Sun, 13 Mar 2011 12:24:17 +0100] rev 13604
hg: add support for cloning bookmarks
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Sat, 12 Mar 2011 18:29:02 +0100] rev 13603
httprepo: use caps instead of between for compat check
We usually query the capabilities at some point anyway so this way the first roundtrip
actually does useful work.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Mar 2011 18:48:30 +0100] rev 13602
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Mar 2011 17:08:42 +0100] rev 13601
bisect: new command to extend the bisect range (issue2690)
When bisect ends in a merge point, and one of the parent wasn't checked,
this usually means the culprit is in a branch that wasn't scanned.
For this case we provide a new command which extends the range of the bisect
search to the common ancestor of the parents of the merge.