Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 12 Mar 2008 15:44:08 -0700] rev 6242
merge: fix handling of deleted files
Bryan O'Sullivan <bos@serpentine.com> [Wed, 12 Mar 2008 15:33:43 -0700] rev 6241
setup.py: os.uname is not available on Windows
Bryan O'Sullivan <bos@serpentine.com> [Wed, 12 Mar 2008 15:31:10 -0700] rev 6240
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Wed, 12 Mar 2008 15:30:11 -0700] rev 6239
Add inotify extension
Patrick Mezard <pmezard@gmail.com> [Wed, 12 Mar 2008 23:21:01 +0100] rev 6238
convert: rename MAPFILE into REVMAP to disambiguate with filemap
Ralf Schmitt <schmir@gmail.com> [Wed, 12 Mar 2008 21:59:22 +0100] rev 6237
Make mercurial easy installable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 12 Mar 2008 22:20:10 +0100] rev 6236
Add tests for the fixes to issue1014 (fractional timezones)
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 12 Mar 2008 09:04:20 +0100] rev 6235
test-fetch failed due to non-zero exit code
Brendan Cully <brendan@kublai.com> [Tue, 11 Mar 2008 16:28:58 -0700] rev 6234
Hide URL passwords in hg paths output.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 11 Mar 2008 16:04:25 -0700] rev 6233
Merge with main
Jonas Diemer <diemer@gmx.de> [Tue, 11 Mar 2008 23:54:03 +0100] rev 6232
Fixed bash completion for filenames containing spaces.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 11 Mar 2008 23:59:43 +0100] rev 6231
merge with main
Matt Mackall <mpm@selenic.com> [Tue, 11 Mar 2008 17:42:51 -0500] rev 6230
dates: Fix bare times to be relative to "today"
Matt Mackall <mpm@selenic.com> [Tue, 11 Mar 2008 17:42:41 -0500] rev 6229
dates: improve timezone handling
datestr:
- add format specifiers %1 and %2 for timezone hours and minutes
- remove timezone and timezone format options
- correctly find timezone hours and minutes for fractional and negative timezones
- update users
strdate:
- correctly find timezone hours and minutes for fractional and negative timezones
Matt Mackall <mpm@selenic.com> [Tue, 11 Mar 2008 17:42:29 -0500] rev 6228
revlog: report node and file when lookup fails
Matt Mackall <mpm@selenic.com> [Tue, 11 Mar 2008 17:42:26 -0500] rev 6227
Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Tue, 11 Mar 2008 11:38:12 -0700] rev 6226
fetch: don't proceed if working directory is missing files (issue988)
Bryan O'Sullivan <bos@serpentine.com> [Tue, 11 Mar 2008 11:30:42 -0700] rev 6225
fetch: rename --force-editor option to --edit, for consistency
Matt Mackall <mpm@selenic.com> [Mon, 10 Mar 2008 02:54:37 -0500] rev 6224
dates: fix fractional timezone display rounding bug
Stephen Deasey <sdeasey@gmail.com> [Sun, 09 Mar 2008 17:34:55 +0000] rev 6223
churn: show comitter email addresses unclipped (bug 1023)
Email addresses were being clipped at a hard-coded 20 chars. Measure
the length of all email addresses and accommodate the longest.
Brendan Cully <brendan@kublai.com> [Sat, 08 Mar 2008 17:28:25 -0800] rev 6222
gitweb: use {url} as entrypoint in notfound.tmpl instead of /
Brendan Cully <brendan@kublai.com> [Sat, 08 Mar 2008 17:19:18 -0800] rev 6221
Support web.baseurl in hgwebdir, overriding SCRIPT_NAME
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 08 Mar 2008 12:40:33 +0100] rev 6220
Fixed typo in tag help, found by John Coomes
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 07 Mar 2008 08:38:07 +0100] rev 6219
hgweb: fix test results missed by 6218:345a23eca8f6
Brendan Cully <brendan@kublai.com> [Thu, 06 Mar 2008 18:40:10 -0800] rev 6218
gitweb: remove some line breaks in archive and rss columns.
Clean up archive formatting a little in the index page.
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:51:16 +0100] rev 6217
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:41 +0100] rev 6216
Add missing import of sys
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:41 +0100] rev 6215
convert: Remove unused clone method
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:41 +0100] rev 6214
convert: Fix unbound name error in the subversion backend
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:41 +0100] rev 6213
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:41 +0100] rev 6212
Remove unused imports
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:26 +0100] rev 6211
Expand import * to allow Pyflakes to find problems
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Mar 2008 00:24:36 +0100] rev 6210
Removed trailing spaces from everything except test output
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Mar 2008 00:01:13 +0100] rev 6209
Replaced tab in run-tests.py
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 05 Mar 2008 08:00:05 +0100] rev 6208
tests: add --keep-tmp to run-tests.py to debug test environment
When set, you can find the working dir of the test run as a
uniquely named subdirectory of --tmpdir so you can inspect
it.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 05 Mar 2008 09:20:57 -0800] rev 6207
fetch: make test reproducible, tiny code cleanup
Bryan O'Sullivan <bos@serpentine.com> [Wed, 05 Mar 2008 09:10:45 -0800] rev 6206
fetch: switch the default parent used for a merge
This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.
The prior default behaviour is still available, via the --switch-parent
option.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 03 Mar 2008 21:48:43 +0100] rev 6205
mq: test for qclone of http repo+queue
tests f857eac30cd5 and 0c2b443fb3c3
Jesse Glick <jesse.glick@sun.com> [Mon, 03 Mar 2008 12:46:57 -0500] rev 6204
When failing to load an extension, show where Hg tried to load it from.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 Mar 2008 23:32:13 +0100] rev 6203
hgweb/annotate: handle binary files like hgweb/file
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 Mar 2008 20:54:00 +0100] rev 6202
test-status: Make assert function definition sh compatible.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 Mar 2008 13:52:34 +0100] rev 6201
Extend/correct acc40572da5b regarding -qA and ignored files.
hg status -qA will now hide untracked files as described in the doc string.
Zoran Bosnjak <zoran.bosnjak@via.si> [Sat, 01 Mar 2008 22:30:03 +0100] rev 6200
'hg status -q' output skips non-tracked files.
The '-q' flag was ignored in status command. But this flag
can be used to hide non-tracked files in hg status output.
This small correction makes status command more general,
similar to 'svn status', where '-q' flag has the same effect.
The '-u' and '-A' flags have priority over '-q'.
A testcase and doc-string for status was extended to cover
'-q' flag.
Brendan Cully <brendan@kublai.com> [Fri, 29 Feb 2008 14:48:21 -0800] rev 6199
highlight: forgot import
Brendan Cully <brendan@kublai.com> [Fri, 29 Feb 2008 14:47:07 -0800] rev 6198
highlight: guess by text when path name is ambiguous
Although the docs claim that guess_lexer_for_filename will fall back
to using file data, my ubuntu 7.10 pygments library seems to ignore
the text argument. So call guess_lexer explicitly on failure.
Brendan Cully <brendan@kublai.com> [Fri, 29 Feb 2008 14:21:15 -0800] rev 6197
highlight: make div trimmer work when lexer fails to identify text.
In this case, there is no initial <span> tag.
Brendan Cully <brendan@kublai.com> [Fri, 29 Feb 2008 11:13:50 -0800] rev 6196
highlight: use iter() instead of generator comprehension
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 29 Feb 2008 09:54:28 +0100] rev 6195
mq: remove unimplemented option -f for strip
Brendan Cully <brendan@kublai.com> [Thu, 28 Feb 2008 22:04:22 -0800] rev 6194
highlight: bail out if file is binary
Brendan Cully <brendan@kublai.com> [Thu, 28 Feb 2008 21:35:27 -0800] rev 6193
highlight: support annotate, and reduce layering violations.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Feb 2008 02:45:12 +0100] rev 6192
Introduce templateopts and logopts to reduce duplicate option definitions.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Feb 2008 02:15:31 +0100] rev 6191
Add option -l/--limit to hg incoming and hg outgoing.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Feb 2008 01:51:23 +0100] rev 6190
Move finding/checking the log limit to cmdutil
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Feb 2008 01:25:31 +0100] rev 6189
Make hg debugancestor accept -R by making it an optionalrepo command.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Feb 2008 01:14:37 +0100] rev 6188
debugancestor: use *args instead of *opts, to not confuse with option dicts.
Marti Raudsepp <marti@juffo.org> [Thu, 28 Feb 2008 17:37:56 +0200] rev 6187
mq: Cleanup: update outdated file header.
Marti Raudsepp <marti@juffo.org> [Thu, 28 Feb 2008 17:37:56 +0200] rev 6186
convert: Clean up authormap key=value splitting.
Introduces a subtle parsing difference: dstauthor can now contain '='
characters.
Marti Raudsepp <marti@juffo.org> [Thu, 28 Feb 2008 17:37:56 +0200] rev 6185
convert: Avoid redundant newline on authormap errors.
The extra rstrip is necessary in case the file has uses different line
terminators (i.e. CRLF).
Marti Raudsepp <marti@juffo.org> [Thu, 28 Feb 2008 17:37:56 +0200] rev 6184
convert: Ignore empty lines in authormap file.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 28 Feb 2008 22:39:59 +0100] rev 6183
Add config option to disable putting .hg_archival.txt inside archives.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 28 Feb 2008 19:08:04 +0100] rev 6182
add a blame alias for annotate
The original cvs command was called blame. SVN has both, and other VC systems
typically also have this as an alias. Makes things easier for converts.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 28 Feb 2008 17:51:04 +0100] rev 6181
warning on push should mention heads, not branches
This makes the concept easier to relate to similar messages given on pull,
and allows for a distinction between heads and (named) branches.
Patrick Mezard <pmezard@gmail.com> [Thu, 28 Feb 2008 00:07:38 +0100] rev 6180
commands: lock() the repo while unbundling (issue1004)
Patrick Mezard <pmezard@gmail.com> [Thu, 28 Feb 2008 00:07:37 +0100] rev 6179
patch: fix iterhunks() with trailing binary file removal
Like some renames or copy operations, binary file removal does not generate any
"file" or "hunk" action, but was not tagged as such and let iterhunk() assume
no hunk was applied for the deleted file.