Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 27 Nov 2008 16:07:17 +0100] rev 7435
bundlerepo doesn't really have a dirstate, throw AttributeError if requested
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 27 Nov 2008 16:07:13 +0100] rev 7434
kill some trailing spaces
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 27 Nov 2008 01:35:12 +0100] rev 7433
merge with mpm
Mads Kiilerich <mads@kiilerich.com> [Thu, 27 Nov 2008 01:10:27 +0100] rev 7432
rpm spec: include python egg in rpm
Better complicance with packaging guidelines
http://fedoraproject.org/wiki/Packaging/Python
http://fedoraproject.org/wiki/Packaging/Python/Eggs
Mads Kiilerich <mads@kiilerich.com> [Thu, 27 Nov 2008 01:09:11 +0100] rev 7431
buildrpm: complain when hg command isn't available
Before it complained "You are not inside a Mercurial repository!" which wasn't true.
Mads Kiilerich <mads@kiilerich.com> [Thu, 27 Nov 2008 00:57:32 +0100] rev 7430
util: use existing never() instead of custom lambda
Mads Kiilerich <mads@kiilerich.com> [Thu, 27 Nov 2008 00:57:31 +0100] rev 7429
tests: Skip tests if they will fail because of outer repo
For different reasons these tests will fail if run in a tmpdir which is in a hg
repo.
The following three tests assumes no .hg in path dirs - I don't know how to
work around that:
* test-dispatch explicitly tests for no repo and expects "abort: There is no
Mercurial repository here (.hg not found)!"
* test-extension expects parentui to be None when not cd'ed to a repo dir
* test-globalopts tests that implicit -R works correctly - that could perhaps be
done from another repo instead of assuming no repo
The following two might be worth investigating further:
* test-convert-svn-sink fails for unknown reasons, starting with "abort:
unresolved merge conflicts (see hg resolve)"
* test-glog gets strange failures when testing "from outer space"
Mads Kiilerich <mads@kiilerich.com> [Thu, 27 Nov 2008 00:57:30 +0100] rev 7428
tests: use killdaemons in hgweb tests
hgweb tests often failed on my system because the serve port wasn't free when a
new hgweb was started; the killed hg wasn't completely dead yet.
Now we use killdaemons which waits for the process to die.
Patrick Mezard <pmezard@gmail.com> [Wed, 26 Nov 2008 22:27:37 +0100] rev 7427
util_win32: fix Windows version checking (issue1358)
shell.SHGetPathFromIDList() segfaults when called in Apache.
Alpar Juttner <alpar@cs.elte.hu> [Fri, 21 Nov 2008 22:27:11 +0000] rev 7426
Graphlog extension adds a --graph option to log/in/out
The --graph option shows the ascii revision graph when used in conjunction
with the incoming, outgoing or log commands.
It also makes sure that incompatible options (e.g. --newest-first) are not
used.
Mads Kiilerich <mads@kiilerich.com> [Sun, 23 Nov 2008 20:16:29 +0100] rev 7425
tests: disable test-convert-darcs properly for darcs 2
The x bit was disabled without notice in 8046f0a070a6
Mads Kiilerich <mads@kiilerich.com> [Sun, 23 Nov 2008 18:17:02 +0100] rev 7424
Fix rpmlint warnings
contrib/mercurial.spec:9: W: hardcoded-path-in-buildroot-tag /tmp/build.%{name}-%{version}-%{release}
A path is hardcoded in your Buildroot tag. It should be replaced by something
like %{_tmppath}/%name-root.
contrib/mercurial.spec:31: W: rpm-buildroot-usage %prep rm -rf $RPM_BUILD_ROOT
$RPM_BUILD_ROOT should not be touched during %build or %prep stage, as it will
break short circuiting.
Mads Kiilerich <mads@kiilerich.com> [Sun, 23 Nov 2008 18:16:02 +0100] rev 7423
Make rpm spec less explicit
Fixes:
* current buildrpm failing on Fedora because of unexpected zeroconf extensions
* unowned directories hgext/*/
Matt Mackall <mpm@selenic.com> [Wed, 26 Nov 2008 13:11:08 -0600] rev 7422
Merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 26 Nov 2008 18:23:35 +0100] rev 7421
Catch both IOError and OSError, fix regression introduced by 8046f0a070a6
Brendan Cully <brendan@kublai.com> [Tue, 25 Nov 2008 18:45:08 -0800] rev 7420
inotify: remove unused imports (thanks pyflakes)
Brendan Cully <brendan@kublai.com> [Tue, 25 Nov 2008 18:32:44 -0800] rev 7419
color: don't run status twice for -n
Just cut off the status characters.
Brendan Cully <brendan@kublai.com> [Tue, 25 Nov 2008 18:21:00 -0800] rev 7418
color: fix status -n
Christian Ebert <blacktrash@gmx.net> [Tue, 25 Nov 2008 16:30:40 +0100] rev 7417
keyword: do not shadow builtin format (detected by pychecker)
Jesse Long <jesse@virtualpostman.co.za> [Tue, 25 Nov 2008 16:40:54 -0600] rev 7416
hooks: restore io correctly on exception
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 25 Nov 2008 23:26:33 +0100] rev 7415
protocol: use changegroupsubset() if possible (issue1389)
Due to the fix to the pull race, to avoid sending unnecessary
changesets, use changegroupsubset if possible.
This will increase the load on the server.
Matt Mackall <mpm@selenic.com> [Tue, 25 Nov 2008 16:24:22 -0600] rev 7414
Merge with crew
Benoit Allard <benoit@aeteurope.nl> [Tue, 25 Nov 2008 23:13:14 +0100] rev 7413
email: add References field in the header
This hopefully helps clients get the threading right.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 25 Nov 2008 22:52:25 +0100] rev 7412
coal/paper: link to shortlog instead of log from error pages
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 25 Nov 2008 22:40:16 +0100] rev 7411
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 25 Nov 2008 22:53:01 +0100] rev 7410
coal/paper: show branch name in changeset view
Benoit Allard <benoit@aeteurope.nl> [Tue, 25 Nov 2008 21:54:28 +0100] rev 7409
coal/paper: display tags and branch in filelog page
Benoit Allard <benoit@aeteurope.nl> [Tue, 25 Nov 2008 22:32:11 +0100] rev 7408
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl> [Tue, 25 Nov 2008 22:51:10 +0100] rev 7407
coal/paper: display branch names in log
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 25 Nov 2008 17:54:49 +0100] rev 7406
hgweb: support broken IIS 5 behavior with .cgi in PATH_INFO
Patrick Mezard <pmezard@gmail.com> [Tue, 25 Nov 2008 22:23:17 +0100] rev 7405
manifest: fix _search() corner-case
It failed when searching the empty string in the null revision.
Brendan Cully <brendan@kublai.com> [Mon, 24 Nov 2008 17:16:39 -0800] rev 7404
Improved error message for log --follow
Mads Kiilerich notes that the existing message was unclear
when a nonexistent file was supplied.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 25 Nov 2008 01:22:43 +0100] rev 7403
Improve the monoblue theme for hgwebdir
Brendan Cully <brendan@kublai.com> [Sat, 22 Nov 2008 00:21:57 -0800] rev 7402
import: add similarity option (issue295)
Brendan Cully <brendan@kublai.com> [Sun, 23 Nov 2008 18:08:19 -0800] rev 7401
mq: recover more gracefully from interrupted qrefresh (issue1216)
Brendan Cully <brendan@kublai.com> [Sun, 23 Nov 2008 16:07:47 -0800] rev 7400
mq: use atomictempfiles during patch refresh
Brendan Cully <brendan@kublai.com> [Sat, 22 Nov 2008 14:04:42 -0800] rev 7399
mq: create patch header class to abstract header manipulation
Brendan Cully <brendan@kublai.com> [Sun, 23 Nov 2008 00:44:31 -0800] rev 7398
mq: gracefully abort qpush/qgoto to guarded patch (issue1186)
Mads Kiilerich <mads@kiilerich.com> [Fri, 07 Nov 2008 02:47:12 +0100] rev 7397
More verbose logging when filemerge searches for merge-tool
Previously it was very hard to find out what was going on when the expected
merge tool wasn't used. This patch tries to improve that.
hg merge -v now shows which tools were searched for but not found.
Brendan Cully <brendan@kublai.com> [Fri, 21 Nov 2008 15:51:40 -0800] rev 7396
templater: return data in increasing chunk sizes
Currently hgweb is not streaming its output -- it accumulates the
entire response before sending it. This patch restores streaming
behaviour. To avoid having to synchronously write many tiny fragments,
this patch also adds buffering to the template generator. Local
testing of a fetch of a 100,000 line file with wget produces a slight
slowdown overall (up from 6.5 seconds to 7.2 seconds), but instead of
waiting 6 seconds for headers to arrive, output begins immediately.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 22 Nov 2008 16:57:49 +0100] rev 7395
tests: fix tests broken by 03b60f2f90bf
Brendan Cully <brendan@kublai.com> [Thu, 20 Nov 2008 18:15:50 -0800] rev 7394
hgweb (coal/paper): make file, diff and annotate easier to render
This patch removes tables altogether for file and diff, and removes
one column from annotate, making firefox's incremental renderer much
faster for large files.
Brendan Cully <brendan@kublai.com> [Wed, 19 Nov 2008 13:00:48 -0800] rev 7393
inotify: fix status . in repo.root
Patrick Mezard <pmezard@gmail.com> [Wed, 19 Nov 2008 13:27:57 +0100] rev 7392
patch: isolate patchfile filesystem calls into methods
This is a first step toward an svn-like patch driver and makes patchfile
monkeypatching much easier. The latter is currently required to support
in-memory patching until the code is refactored.
Patrick Mezard <pmezard@gmail.com> [Wed, 19 Nov 2008 13:27:57 +0100] rev 7391
patch: pass an opener to patchfile
Patrick Mezard <pmezard@gmail.com> [Tue, 18 Nov 2008 13:20:55 +0100] rev 7390
util_win32: implement posixfile_nt.readlines()
Patrick Mezard <pmezard@gmail.com> [Wed, 19 Nov 2008 13:27:57 +0100] rev 7389
patch: remove useless unlink() call
Matt Mackall <mpm@selenic.com> [Tue, 18 Nov 2008 16:02:14 -0600] rev 7388
dispatch: generalize signature checking for extension command wrapping
Matt Mackall <mpm@selenic.com> [Tue, 18 Nov 2008 15:35:34 -0600] rev 7387
update help on git diffs
Brendan Cully <brendan@kublai.com> [Mon, 17 Nov 2008 11:45:38 -0800] rev 7386
zsh: make resolve with no options only complete unresolved files
Brendan Cully <brendan@kublai.com> [Sun, 16 Nov 2008 20:56:55 -0800] rev 7385
mergetools: add pointer to the usual filemerge path
Brendan Cully <brendan@kublai.com> [Sun, 16 Nov 2008 19:49:36 -0800] rev 7384
zsh: support for resolve
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Sun, 16 Nov 2008 20:55:30 +0100] rev 7383
graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Patrick Mezard <pmezard@gmail.com> [Sat, 15 Nov 2008 15:57:12 +0100] rev 7382
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 15 Nov 2008 15:51:26 +0100] rev 7381
convert: be even more tolerant when detecting svn tags
Former code failed when tracking child directories we assumed were renamed with
their parents but were really created in the tags directory. This happens in
jQuery repository with /tags/ui/1.5b4/release@5455.
Patrick Mezard <pmezard@gmail.com> [Sat, 15 Nov 2008 15:09:11 +0100] rev 7380
test-pull-branch: make it executable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 15 Nov 2008 12:27:40 +0100] rev 7379
graphlog: fix python2.3 incompatibility (used genexp, sorted())
Christian Ebert <blacktrash@gmx.net> [Fri, 14 Nov 2008 22:29:03 +0100] rev 7378
keyword: move common code out of commit condition
Matt Mackall <mpm@selenic.com> [Fri, 14 Nov 2008 14:12:43 -0600] rev 7377
lookup: fast-paths for int and 'tip'
Matt Mackall <mpm@selenic.com> [Fri, 14 Nov 2008 14:12:16 -0600] rev 7376
doc: handle shortened command synopses
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 14 Nov 2008 19:10:09 +0100] rev 7375
keyword: be more efficient about ctx usage
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 14 Nov 2008 18:34:47 +0100] rev 7374
graphlog: kill whitespace from earlier refactoring
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 14 Nov 2008 14:17:42 +0100] rev 7373
extensions: copy __module__ for wrapped commands
Benoit Allard <benoit@aeteurope.nl> [Fri, 14 Nov 2008 14:36:17 +0100] rev 7372
pull: update to branch tip if there is only one head on the current branch
On pull, if the current named branch has only one head, update to it.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 14 Nov 2008 13:48:23 +0100] rev 7371
graphlog: use built-in log output buffering
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 14 Nov 2008 13:44:10 +0100] rev 7370
graphlog: refactor common grapher code
Extracts the column and edge determination code into a separate function
usable on generic DAGs with at most 2 parents per node.
grapher() is very similar to graphmod.graph(). I shall look into merging
them when I try visualizing patch branches in hgweb.
Started using contexts and renamed a bunch of variables (fewer underscores).
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 14 Nov 2008 13:59:25 +0100] rev 7369
cmdutil: use change contexts for cset-printer and cset-templater
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 14 Nov 2008 12:44:26 +0100] rev 7368
context: use descriptors to speed up lazy attributes
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 13 Nov 2008 21:09:51 +0100] rev 7367
context: special-case changectx setup for integer changeid
Matt Mackall <mpm@selenic.com> [Thu, 13 Nov 2008 12:52:03 -0600] rev 7366
Add contrib/perf.py for performance testing
Matt Mackall <mpm@selenic.com> [Wed, 12 Nov 2008 19:11:34 -0600] rev 7365
lookup: speed up partial lookup
Matt Mackall <mpm@selenic.com> [Wed, 12 Nov 2008 19:11:09 -0600] rev 7364
help: remove redundant 'hg <command>' from command synopses
Matt Mackall <mpm@selenic.com> [Wed, 12 Nov 2008 15:58:46 -0600] rev 7363
revlog: speed up parents()
Matt Mackall <mpm@selenic.com> [Wed, 12 Nov 2008 15:32:16 -0600] rev 7362
revlog: remove delta function
Matt Mackall <mpm@selenic.com> [Wed, 12 Nov 2008 15:19:14 -0600] rev 7361
linkrev: take a revision number rather than a hash
Chris Winter <elwintro@gmail.com> [Thu, 13 Nov 2008 10:11:32 +0100] rev 7360
patchbomb: add option to send intro email for a single patch (issue1120)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 12 Nov 2008 19:12:32 +0100] rev 7359
patchbomb: fix patch name generation in patch series
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 12 Nov 2008 19:12:26 +0100] rev 7358
patchbomb: add tests for diffstat, inline, and attach options
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 12 Nov 2008 19:12:21 +0100] rev 7357
patchbomb: make test markers more syntax highlighter friendly
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 12 Nov 2008 16:32:21 +0100] rev 7356
graphlog: add assertion for allowed n_column_diff range
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 12 Nov 2008 16:32:35 +0100] rev 7355
graphlog: drop redundant comment (see docstring)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 12 Nov 2008 14:36:16 +0100] rev 7354
patchbomb: extract a bunch of nested functions
- clarifies dependencies on variables
- extracts potentially useful utility functions
- no need for separate confirm() function
- error message style conformance
- PEP 8 conformance
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 12 Nov 2008 14:07:47 +0100] rev 7353
patchbomb: make `hg email` reusable for other patch sources
Adds two internal options, patches and patchnames, which allow other extensions
to email a given set of patches. The pbranch extension needs this to send its
patches which are diffs between topic branches.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 12 Nov 2008 14:01:09 +0100] rev 7352
patchbomb: make options to email command reusable
Makes the option set that controls the actual emailing of the patches
available as patchbomb.emailopts.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 12 Nov 2008 09:08:43 +0100] rev 7351
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 11 Nov 2008 23:16:59 +0100] rev 7350
inotify: fix replacing a folder with a file (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 09 Nov 2008 12:15:32 +0100] rev 7349
fix test-export portability (issue1383)
wc outputs with leading spaces on *BSD
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 08 Nov 2008 00:29:04 +0100] rev 7348
merge with mpm
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 08 Nov 2008 00:27:51 +0100] rev 7347
tests: fix test failures from default/template changes
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 07 Nov 2008 23:56:02 +0100] rev 7346
tests: make killdaemons.py executable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 07 Nov 2008 23:31:12 +0100] rev 7345
hgweb: fix up the less/more links on the graph page
Previously, they pointed to a non-intuitive revision, and got borked when
using a URL-specified style combined with alternate revcounts.
Matt Mackall <mpm@selenic.com> [Fri, 07 Nov 2008 16:28:53 -0600] rev 7344
tests: add killdaemons helper script
Matt Mackall <mpm@selenic.com> [Fri, 07 Nov 2008 16:28:52 -0600] rev 7343
run-tests: allow turning off diff display
Matt Mackall <mpm@selenic.com> [Fri, 07 Nov 2008 15:30:25 -0600] rev 7342
protocol: avoid sending outrageously large between requests
Matt Mackall <mpm@selenic.com> [Thu, 06 Nov 2008 13:15:35 -0600] rev 7341
tests: fix test-hgweb to not leak directory name
Matt Mackall <mpm@selenic.com> [Thu, 06 Nov 2008 12:46:34 -0600] rev 7340
hgweb: improve color discrimination for paper and coal