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
Matt Mackall <mpm@selenic.com> [Thu, 06 Nov 2008 12:22:09 -0600] rev 7339
hgweb: update tests for paper style
diff -r ca03debb3dcd -r 4e1e6aee37e8 tests/test-hgweb-commands.out
Binary file tests/test-hgweb-commands.out has changed
Matt Mackall <mpm@selenic.com> [Thu, 06 Nov 2008 11:57:37 -0600] rev 7338
hgweb: move old style to spartan/
Matt Mackall <mpm@selenic.com> [Thu, 06 Nov 2008 11:56:01 -0600] rev 7337
hgweb: Change default style to paper
Mark Edgington <edgimar@gmail.com> [Fri, 31 Oct 2008 15:28:06 +0100] rev 7336
hgweb: support for deny_read/allow_read options
reimplementation of a patch provided by Nilton Volpato.
Folded into a single patch by Thomas Arendsen Hein.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 07 Nov 2008 18:42:43 +0100] rev 7335
add missing import from 618140c75d8d
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 07 Nov 2008 18:41:22 +0100] rev 7334
fix restart of interrupted recover
Ignore missing files if they are already removed.
Thanks maelcum on IRC for reporting it.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 07 Nov 2008 15:47:01 +0100] rev 7333
hgweb: show revision number in the graph pagination
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 07 Nov 2008 15:40:36 +0100] rev 7332
hgweb: fix pagination for graph
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Nov 2008 13:22:41 +0100] rev 7331
Keep sessionvars with repository links added in a0843c82d1a2
Without this, e.g. "?style=coal" would be dropped.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Nov 2008 13:08:34 +0100] rev 7330
Fix test output for updated gitdiffs help and web template cleanups
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Nov 2008 13:02:04 +0100] rev 7329
Do not abort with inotify extension enabled, but not supported by the system.
And remove the "native support is required" message which is generated at an
inappropriate location and is printed more than once when using 'hg status'.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Nov 2008 13:02:03 +0100] rev 7328
Enhance gitdiffs help text
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Nov 2008 13:02:02 +0100] rev 7327
Kill trailing whitespace in templates
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 07 Nov 2008 11:44:37 +0100] rev 7326
graphlog: move functions around, eliminate helper function
Makes it easier to read all of the code.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 07 Nov 2008 10:37:20 +0100] rev 7325
graphlog: split the actual DAG grapher out into a separate method
This allows extensions like pbranch to use asciigraph() to graph dependencies
for patch branches, but could be used for basically any DAG.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 07 Nov 2008 10:29:43 +0100] rev 7324
graphlog: rename some vars prior to refactoring
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 07 Nov 2008 10:29:35 +0100] rev 7323
graphlog: make some comment lines more like others in punctuation
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 07 Nov 2008 10:18:55 +0100] rev 7322
patchbomb: fix indentation
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 07 Nov 2008 10:18:12 +0100] rev 7321
patchbomb: move exportee class to top level
As suggested by djc.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 07 Nov 2008 10:27:39 +0100] rev 7320
ui: log non-interactive default response to stdout when verbose
This allows test scripts that feed their output into documentation
to properly show the session as it would appear to an end-user.
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Thu, 06 Nov 2008 11:17:38 +0100] rev 7319
export: fixed silent output file overwriting
hg export -o outfile 1 2 3 4 had the same effect as hg -o outfile 4
This was caused by opening with 'w' instead of 'a'. This only occurs when
the filename pattern resulted in ambiguous patch filenames.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 06 Nov 2008 10:39:52 +0100] rev 7318
merge bookmarks
Alexander Solovyov <piranha@piranha.org.ua> [Thu, 06 Nov 2008 10:31:09 +0100] rev 7317
bookmarks: Test if rebase works with bookmarks
Add a test that tests if rebase works fine with bookmarks.
David Soria Parra <dsp@php.net> [Wed, 05 Nov 2008 03:53:34 +0100] rev 7316
bookmarks: Use dirstate to determine the current node in addchangegroup
Using the changectx might result in a lookup error during the strip command.
Thefore we use the current dirstate to get the parents of the working directory.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 05 Nov 2008 18:57:54 +0100] rev 7315
tests: run svn tests only with svn bindings >1.3
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 05 Nov 2008 09:48:56 +0100] rev 7314
coal/paper: link repo name to hgweb root
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 05 Nov 2008 09:42:52 +0100] rev 7313
paper: don't keep the menu affixed to the top
This makes scrolling slow and causes browsers to use a lot of CPU time.
Matt Mackall <mpm@selenic.com> [Mon, 03 Nov 2008 16:01:24 -0600] rev 7312
Shorten sleep in inotify test
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 03 Nov 2008 20:31:53 +0100] rev 7311
hgweb: move another utility function into the webutil module
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 03 Nov 2008 20:41:48 +0100] rev 7310
hgweb: move the diffs() generator into webutil
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 03 Nov 2008 20:05:03 +0100] rev 7309
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
This gets us git diffs when enabled and doesn't pick erratic file parents.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 03 Nov 2008 16:48:23 +0100] rev 7308
patch: turn patch.diff() into a generator
This should even be a little faster than passing in an fp argument.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 03 Nov 2008 16:31:47 +0100] rev 7307
help: commands supporting --git point to the gitdiffs topic (issue1352)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 03 Nov 2008 16:30:21 +0100] rev 7306
mq: reflow qnew help, add help for options
Ry4an Brase <ry4an-hg@ry4an.org> [Mon, 03 Nov 2008 10:20:28 +0100] rev 7305
hgweb: descend empty directories in web view
When a manifest has a series of directories with nothing in them but a single
directory, displaying the entire chain of empty directories allows for
navigation down to the first non-empty directory with a single click.
Because Java links package hierarchy to directory hierarchy, and because Java
conventions include at least three empty directories at the top of this
hierarchy, descending down empty directories is very common in Java web tools.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 02 Nov 2008 22:44:42 +0100] rev 7304
inotify: fix bug in formatting
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 Nov 2008 17:28:03 +0100] rev 7303
Corrected some command synopsises
Gerard Korsten <soonkia77@gmail.com> [Sat, 01 Nov 2008 14:05:13 +0200] rev 7302
inotify: server raising an error when removing a file (issue1371)
When a file is deleted via hg rm <file> the dirstate marks the file with a
status of 'r'. The physical file has been deleted, but the inotify server
tries to do a stat on the file after it's been removed.
Patch catches the exception and correctly call updatestatus()
Patrick Mezard <pmezard@gmail.com> [Sat, 01 Nov 2008 15:15:14 +0300] rev 7301
Fix util._statfiles_clustered() failing at root of a windows drive
Report and initial fix by Andrei Vermel <avermel@mail.ru>.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 01 Nov 2008 13:07:24 +0100] rev 7300
hgweb: conditionally show file logs for deleted files
Benoit Allard <benoit@aeteurope.nl> [Sat, 01 Nov 2008 13:07:20 +0100] rev 7299
coal/paper: show a search tip when hovering over search box
This doesn't work in IE, because IE only supports :hover on <a> elements.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 01 Nov 2008 13:06:36 +0100] rev 7298
kill some trailing spaces
Brendan Cully <brendan@kublai.com> [Thu, 30 Oct 2008 12:38:24 -0700] rev 7297
mq: use cmdutil.matchfiles instead of match for qnew -f.
Closes issue1368.
Brendan Cully <brendan@kublai.com> [Thu, 30 Oct 2008 12:31:24 -0700] rev 7296
mq: put qnew tests into own file, fold in qnew-twice
Augie Fackler <durin42@gmail.com> [Wed, 29 Oct 2008 18:54:46 -0500] rev 7295
zeroconf: Don't break serve if no internet connection is present.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 30 Oct 2008 09:46:45 +0100] rev 7294
hgweb: pass more information about parent/child csets to templates
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 30 Oct 2008 08:21:20 +0100] rev 7293
help: add a topic on git diffs (issue1352)
Brendan Cully <brendan@kublai.com> [Wed, 29 Oct 2008 10:55:51 -0700] rev 7292
hgweb coal/paper: Restore IE compatibility hack
Brendan Cully <brendan@kublai.com> [Wed, 29 Oct 2008 10:55:29 -0700] rev 7291
Backed out changeset a1f8ad3c1821
Adrian Buehlmann <adrian@cadifra.com> [Wed, 29 Oct 2008 13:37:35 +0100] rev 7290
add test-fncache
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 29 Oct 2008 11:39:32 +0100] rev 7289
merge with mpm
Brendan Cully <brendan@kublai.com> [Tue, 28 Oct 2008 22:24:17 -0700] rev 7288
Allow per-file shadowing of static directory in templatepath
Brendan Cully <brendan@kublai.com> [Tue, 28 Oct 2008 21:58:30 -0700] rev 7287
hgweb: handle subdirectories within static directory
Brendan Cully <brendan@kublai.com> [Tue, 28 Oct 2008 21:31:21 -0700] rev 7286
coal: remove dead CSS code
Patrick Mezard <pmezard@gmail.com> [Tue, 28 Oct 2008 23:54:01 +0100] rev 7285
url: detect scheme with a regexp instead of urlsplit()
The latter says 'c' is a scheme in 'c:\foo\bar'
Patrick Mezard <pmezard@gmail.com> [Tue, 28 Oct 2008 22:24:41 +0100] rev 7284
url: fix file:// URL handling
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Oct 2008 20:48:30 +0100] rev 7283
bookmarks: fix strip handling
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Oct 2008 20:23:22 +0100] rev 7282
fix zeroconf handling for hgwebdir (error found by pychecker)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Oct 2008 20:14:45 +0100] rev 7281
fix missing import, spotted by pychecker
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Oct 2008 19:25:26 +0100] rev 7280
remove unused variables
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Oct 2008 19:07:14 +0100] rev 7279
Fix https availability checking
thanks to Augie Fackler for noticing it.
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Tue, 16 Sep 2008 17:51:14 +0200] rev 7278
rebase: avoid redundant merges (issue1301)
Mads Kiilerich <mads@kiilerich.com> [Mon, 06 Oct 2008 14:41:22 +0200] rev 7277
Make contrib/buildrpm work on Fedora 9.
mercurial.spec had bitrotted. These changes makes it possible to build an rpm that is usable.
Only minimal changes has been made, and there is plenty of room for improvement.
Greg Ward <gerg.ward+hg@gmail.com> [Mon, 27 Oct 2008 13:38:31 -0400] rev 7276
help: Refine a bit the help text of "hg update"
Parts of the original text were submitted by Hubert Kauker (Hubert
dot Kauker at travelbasys.de). This is a slightly revised version
of Hubert's original text.
Adrian Buehlmann <adrian@cadifra.com> [Mon, 27 Oct 2008 19:39:41 +0100] rev 7275
add new test-hybridencode.py
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Oct 2008 08:26:18 +0100] rev 7274
statichttprepo: cleanups, use url.py (proxy, password support)
- unify httprangereader.py and statichttprepo.py:rangegreader()
- build the opener from url.py, that allows use to puse username and password
in the url, to follow the proxy settings from hgrc, etc.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Oct 2008 08:18:11 +0100] rev 7273
'\' should be escaped twice, for the shell, and for tr
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Oct 2008 00:03:28 +0100] rev 7272
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 27 Oct 2008 21:50:16 +0100] rev 7271
use our urlopener (proxy handling, etc) instead of urllib
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 27 Oct 2008 21:50:01 +0100] rev 7270
factor out the url handling from httprepo
Create url.py to handle all the url handling:
- proxy handling
- workaround various python bugs
- handle username/password embedded in the url
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 27 Oct 2008 17:48:05 +0100] rev 7269
httprepo: factor out proxy handling
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Oct 2008 23:47:17 +0100] rev 7268
test-http-proxy: hide logged URL port number, works with--jobs
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Oct 2008 22:57:55 +0100] rev 7267
patch: rewrite diffstat with util.filter()
Simpler and works under Windows.
Patrick Mezard <pmezard@gmail.com> [Sat, 25 Oct 2008 13:24:14 +0200] rev 7266
test-mq-qimport: fix URL generation under windows
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Oct 2008 22:07:39 +0100] rev 7265
test-patchbomb: write in binary mode, force non-interactive mode (win32)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 27 Oct 2008 17:37:37 +0100] rev 7264
test-http-proxy: print the log from the proxy
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 27 Oct 2008 13:52:55 +0100] rev 7263
merge with dsop
Dmitriy Taychenachev <dimichxp@gmail.com> [Sun, 26 Oct 2008 17:08:48 +0800] rev 7262
bookmarks: do nothing if commit was not successful.
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7261
bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7260
bookmarks: Strip bookmark names of whitespace, just like tag names
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7259
bookmarks: Correctly reject newlines in bookmark names
Without this fix, a single newline is a valid bookmark name since
strip() removes it.
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7258
bookmarks: Require a bookmark name when a revision is specified
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7257
bookmarks: Improve documentation
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7256
bookmarks: Avoid unconditional forwarding of bookmarks for the null revision
This patch fixes the following minor problem:
% hg bookmark -r null test
% hg bookmarks
test -1:000000000000
[...]
% hg commit
% hg bookmarks
* test 17:861ce7a241f9
That is: Bookmarks referring to the null revision are always forwarded
to the current revision.
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7255
bookmarks: Rename --move to --rename
To me, --move sounds like "make an existing bookmark refer to another
revision", but --move currently means "rename an existing bookmark".
This patch renames the switch to --rename to make it easier to
understand.
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7254
bookmarks: Require new bookmark name when renaming
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7253
bookmarks: Only save undo.bookmarks if bookmarks exist
Otherwise the command will abort when there is no .hg/bookmarks file.
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:42 +0200] rev 7252
bookmarks: Avoid long lines
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 16:30:11 +0200] rev 7251
bookmarks: Fix spelling and grammar
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 16:29:58 +0200] rev 7250
bookmarks: Remove trailing space
Adrian Buehlmann <adrian@cadifra.com> [Mon, 27 Oct 2008 13:22:45 +0100] rev 7249
test-init: add test with format.usefncache=false
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 27 Oct 2008 13:17:26 +0100] rev 7248
merge with crew
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Oct 2008 17:26:28 +0100] rev 7247
patch: fix patched files records in externalpatcher()
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Oct 2008 14:02:32 +0100] rev 7246
Merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Oct 2008 15:34:58 +0200] rev 7245
merge with crew
Bartosz SKOWRON <getxsick at gmail dot com> [Fri, 24 Oct 2008 20:46:56 +0200] rev 7244
patch: remove double variables in copyfile() func
Edouard Gomez <ed.gomez@free.fr> [Sun, 19 Oct 2008 00:32:23 +0200] rev 7243
convert: return remote branches in git source
When converting git repos, all stuff happening on branches
seems to be ignored.
This is caused by the fact a "git clone" of a remote git
repo has all its branches prefixed with "origin/". By
chance, the "origin/master" branch is always linked to a
local "master" branch. So getheads() returns only the
master head, and it ignores all the other heads.
Make sure getheads() returns all heads, forcing remote
branches to be return by git-rev-parse.
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Oct 2008 13:23:02 +0100] rev 7242
convert: fix non-ASCII filenames retrieval from git sources (issue 1360)
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Oct 2008 11:57:20 +0200] rev 7241
hgrc.5: explain order of mail.charsets
TODO: add mail.charsets section to hgrc.5.ja.txt
Christian Ebert <blacktrash@gmx.net> [Fri, 24 Oct 2008 08:16:01 +0200] rev 7240
test 261a9f47b44b: grep w/ match in last line w/o newline
Last character in match output omitted to avoid infinite loop.
David Soria Parra <dsp@php.net> [Wed, 22 Oct 2008 21:53:27 +0200] rev 7239
Bookmarks: Add the bookmarks extension
Mercurial bookmarks are local moveable pointers to changesets.
If you commit a changeset that is based on a changeset that has a
bookmark on it, the bookmark is forwarded to the new changeset.
Thanks to Ian Dees, Ronny Pfannschmidt for their patches,
Thanks to ronny, tonfa, prianha, mpm, #mercurial for their comments
and their support that helped me to get things done.
Matt Mackall <mpm@selenic.com> [Fri, 24 Oct 2008 11:35:47 -0500] rev 7238
zeroconf: don't break on hg showconfig
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Oct 2008 16:20:53 +0200] rev 7237
findincoming: build the correct list from the start
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 24 Oct 2008 15:00:40 +0200] rev 7236
Remove trailing spaces.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 24 Oct 2008 14:58:24 +0200] rev 7235
Document config option format.usefncache and improve format.usestore docs.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 24 Oct 2008 10:31:51 +0200] rev 7234
add format.usefncache config option (default is true)
This enables for example "hg clone --config format.usefncache=0" which
creates a non-fncache repository, which then can be read by Mercurial
versions before 7946503ec76e.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Oct 2008 17:00:35 +0200] rev 7233
fix pull racing with push/commit (issue1320)
changegroup() has a problem when nodes which does not descend from a node
in <bases> are added to remote after the discovery phase.
If that happens, changegroup() won't send the correct set of nodes, ie.
some nodes will be missing.
To correct it we have to find the set of nodes that both remote and self
have (called <common>), and send all the nodes not in <common>.
This fix has some overhead, in the worst case it will re-send a whole branch.
A proper fix to avoid this overhead might be to change the protocol so that
the <common> nodes are sent (instead of the <bases> of the missing nodes).
Patrick Mezard <pmezard@gmail.com> [Thu, 23 Oct 2008 23:03:09 +0200] rev 7232
convert: correctly detect missing revlog for root revisions
Patrick Mezard <pmezard@gmail.com> [Tue, 21 Oct 2008 21:24:47 +0200] rev 7231
convert: ignore hg source errors with hg.ignoreerrors (issue 1357)
This flag makes missing revlog errors to be ignored which allow broken
repositories to be fixed by converting them from and to Mercurial.
Matt Mackall <mpm@selenic.com> [Thu, 23 Oct 2008 14:56:16 -0500] rev 7230
grep: avoid infinite loop when trailing newline is missing
Adrian Buehlmann <adrian@cadifra.com> [Sun, 19 Oct 2008 19:12:07 +0200] rev 7229
introduce fncache repository layout
* adds a new entry 'fncache' to '.hg/requires' for new repos
* writes new file '.hg/store/fncache'
* hash-encodes filenames with long paths (issue839)
* encodes Windows reserved filenames (issue793)
Alexander Solovyov <piranha@piranha.org.ua> [Thu, 16 Oct 2008 19:40:09 +0300] rev 7228
bisect with command: ability to skip revision or abort bisection
Alexander Solovyov <piranha@piranha.org.ua> [Fri, 10 Oct 2008 16:58:14 +0300] rev 7227
bisect: ability to check revision with command
Mads Kiilerich <mads@kiilerich.com> [Tue, 14 Oct 2008 21:28:49 +0200] rev 7226
Make it possible to disable filtering for a pattern.
Rationale: Apparently there were no way to disable for example win32text extension locally.
RFC: Can it already be done another way?
Martin Geisler <mg@daimi.au.dk> [Tue, 21 Oct 2008 17:47:49 +0200] rev 7225
i18n: import _ instead of gettext
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 23 Oct 2008 19:27:25 +0200] rev 7224
Minor cleanup: Add missing space forgotten in recent change.
Patrick Mezard <pmezard@gmail.com> [Thu, 23 Oct 2008 15:44:23 +0200] rev 7223
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Thu, 23 Oct 2008 14:05:11 +0200] rev 7222
convert: read git output in binary mode under Windows (issue 1359)
Patrick Mezard <pmezard@gmail.com> [Thu, 23 Oct 2008 15:35:54 +0200] rev 7221
util: add 'mode' argument to popen()
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 19:40:32 -0500] rev 7220
inotify: avoid passing potentially stale stat to update
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 19:40:32 -0500] rev 7219
inotify: add debugging mode to inotify
compare inotify results with dirstate results and report any changes
return dirstate results for safety
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 19:40:29 -0500] rev 7218
inotify: auto-start by default when enabled
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 17:41:41 -0500] rev 7217
inotify: friendlier message when daemon not running
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 17:34:52 -0500] rev 7216
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 17:34:50 -0500] rev 7215
extensions: add wrapping functions
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 17:34:37 -0500] rev 7214
run-tests: --interactive overrides -j
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 17:34:08 -0500] rev 7213
findcmd: have dispatch look up strict flag
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 17:00:05 -0500] rev 7212
imported patch filteruser.patch
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 15:41:32 -0500] rev 7211
Autodetect static-http
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 14:30:34 -0500] rev 7210
help: update help
make help description 'topic'-oriented rather than 'command'-oriented
change 'special' to 'additional'
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 13:05:40 -0500] rev 7209
chmod -x simplemerge.py
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 22 Oct 2008 21:43:35 +0200] rev 7208
findincoming: do the binary search in branches in parallel
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 22 Oct 2008 21:41:57 +0200] rev 7207
protocol/between: the protocol expects to have ' '-separated tuples
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 22 Oct 2008 21:39:56 +0200] rev 7206
tests: log and show errors
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 22 Oct 2008 19:28:37 +0200] rev 7205
theme/monoblue: put the search box entirely in the header
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Oct 2008 18:55:07 +0200] rev 7204
Remove trailing space
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 22 Oct 2008 18:32:22 +0200] rev 7203
theme/monoblue: do not use a fixed width for the overview box
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 22 Oct 2008 18:32:17 +0200] rev 7202
tests: add more testing for webdir nesting
Benoit Allard <benoit@aeteurope.nl> [Wed, 22 Oct 2008 18:23:32 +0200] rev 7201
hgwebdir: show nested repositories (issue1336)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 22 Oct 2008 13:14:52 +0200] rev 7200
patch/diff: use a separate function to write the first line of a file diff
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 22 Oct 2008 12:56:28 +0200] rev 7199
patch: consolidate two different regexes for parsing of git diffs
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 22 Oct 2008 09:29:26 +0200] rev 7198
patch: extract local function addmodehdr
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 21 Oct 2008 11:29:27 +0200] rev 7197
help: show extension commands in short list, separate extension list in help
In 'hg', we now show a short list of commands, including extension commands.
In 'hg help', we show core commands, a list of enabled extensions, and topics.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 21 Oct 2008 11:05:45 +0200] rev 7196
help: show help topics by default in 'hg help', with longest available id
Christian Ebert <blacktrash@gmx.net> [Tue, 21 Oct 2008 10:29:57 +0200] rev 7195
mail: correct typo in variable name
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 20 Oct 2008 18:29:44 +0200] rev 7194
merge with crew
Christian Ebert <blacktrash@gmx.net> [Mon, 20 Oct 2008 17:40:29 +0200] rev 7193
mail: test patch mime encoding for patchbomb
Christian Ebert <blacktrash@gmx.net> [Mon, 20 Oct 2008 17:40:29 +0200] rev 7192
patchbomb: mime-encode clean utf-8 patches (issue814)
Fixes issue814, but only for utf.
Christian Ebert <blacktrash@gmx.net> [Mon, 20 Oct 2008 17:40:29 +0200] rev 7191
mail: mime-encode patches that are utf-8
utf-8 can be safely detected without making assumptions on the
encoding/locale used by the recipient.
Content-Transfer-Encoding for utf-8 patches is base64 (default of
python's email module).
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 20 Oct 2008 15:19:05 +0200] rev 7190
Some additional space/tab cleanups
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 20 Oct 2008 14:58:49 +0200] rev 7189
merge with crew-stable, again
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 20 Oct 2008 14:57:56 +0200] rev 7188
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 20 Oct 2008 14:53:53 +0200] rev 7187
spaces->tabs in one line of a C extension for consistency
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 20 Oct 2008 14:57:04 +0200] rev 7186
clean up trailing spaces, leading spaces in C
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 20 Oct 2008 14:52:58 +0200] rev 7185
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 20 Oct 2008 14:51:55 +0200] rev 7184
clean up trailing spaces
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 20 Oct 2008 14:13:37 +0200] rev 7183
hgweb: working diff for removed files
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 20 Oct 2008 12:41:09 +0200] rev 7182
hgweb: remove links to non-existent file versions
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 20 Oct 2008 10:20:35 +0200] rev 7181
coal/paper: widen author column in log table
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 20 Oct 2008 10:15:26 +0200] rev 7180
hgweb: be sure to drain request data even in early error conditions
Thanks to Mads Kiilerich with noticing this. The hg client can only read data
after all the sent data has been read, so we have to read all the request data
even if we're not going to do anything with it (in error conditions). This
is not easy to fix in the client, because we're using Python's httplib, which
is strictly stateful. Abstracted the draining into a separate method.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 19 Oct 2008 22:07:43 +0200] rev 7179
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 19 Oct 2008 19:49:56 +0200] rev 7178
Fix Debian bug #494889 (fetching from static-http://... broken)
Changeset 6605a03cbf87 which fixed issue965 (hg clone static-http
does not work for empty repos) broke cloning of repos with old layout
(without store) via static-http.
This fix makes cloning from old-style repositories possible again,
but will not allow cloning of empty old-style repositories as this
can not be detected reliably.
Mads Kiilerich <mads@kiilerich.com> [Sun, 19 Oct 2008 16:31:24 +0200] rev 7177
mq: Fix --qrefresh --short to work with --exclude and --include
pmezard expects
hg qref -s -X b
to apply the -X to the list of files in the patch, and thus remove b from the
patch.
That's how it worked before f7fc5f5ecd62. That change seemed sensible, but it
wasn't...
mpm says
(17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ?
(17:22:54) pmezard_: kiilerix1: and --include too
(17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar
so mpm expects
hg qref -s -X b *
to apply the -X to the list of files in the working directory, and thus don't
include b in the patch
This patch tries to make both usecases work by creating a matchfn which uses
the include/excludes but not the filelist.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Oct 2008 20:29:41 +0200] rev 7176
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Oct 2008 20:17:06 +0200] rev 7175
parsers.c: do not try to untrack after a failure
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Oct 2008 20:16:37 +0200] rev 7174
parsers.c: fix integer overflows
thanks to zzuf for helping finding those
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 19 Oct 2008 19:10:26 +0200] rev 7173
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 19 Oct 2008 19:03:23 +0200] rev 7172
Use dummy diffstat in tests and remove older diffstat workaround.
This makes test-notify pass on systems without diffstat installed
or where the diffstat version yields a different output.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 19 Oct 2008 17:40:35 +0200] rev 7171
Fix test-bundle-type output by changing head|cut to cut|head.
With some versions of cut the output otherwise has no end of line.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 19 Oct 2008 15:24:33 +0200] rev 7170
convert documentation: --config argument with spaces needs quoting.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 19 Oct 2008 15:08:30 +0200] rev 7169
Copy index before parsing to enforce alignment with inline data present.
Fixes issue1348 (Bus error in parsers.c) on Solaris/sparc.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Oct 2008 16:11:23 +0200] rev 7168
parsers.c: there is no reference to data_obj, so it shouldn't be decref'ed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Oct 2008 13:00:36 +0200] rev 7167
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Oct 2008 12:23:58 +0200] rev 7166
hgweb: nodeids should be aligned in raw changesets
If they aren't it breaks hg import --exact
Thanks to Jesper Noehr for noticing it.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 19 Oct 2008 12:34:34 +0200] rev 7165
Fix test-notify output for older diffstat versions.