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