Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 11:12:35 -0500] rev 6325
pager: remove pager code from core
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 11:12:35 -0500] rev 6324
pager: further simplify code, clean up comments
David Soria Parra <dsp@php.net> [Thu, 20 Mar 2008 00:57:14 +0100] rev 6323
Use the pager given by the environment to display long output
Unix systems usually have a PAGER environment variable set.
If it is set, mercurial will use the pager application to display
output.
Two configuration variables are available to influence the
behaviour of the pager:
pager.application
sets the application to be used
pager.quiet
silences Broken Pipe errors that might occur when the user
quits the pager before mercurial finished to write the output
Dennis Schoen <ds@1d10t.de> [Wed, 16 Jan 2008 11:50:24 +0100] rev 6322
hgk: don't exit if mercurial commands only print warnings
John Coomes <john.coomes@sun.com> [Fri, 14 Mar 2008 15:38:56 -0700] rev 6321
tag: allow multiple tags to be added or removed
- Example: "hg tag -r 42 build-25 beta-1" will add tags build-25 and beta-1
for rev 42.
- The deprecated and undocumented usage "hg tag arg1 arg2" used to emit a
warning, then add tag arg1 for rev arg2 (equivalent to "hg tag -r arg2 arg1").
It will now add tags arg1 and arg2 for the current revision.
- If one tag triggers an error, no tags are added/removed (all or nothing).
Giorgos Keramidas <keramida@ceid.upatras.gr> [Mon, 17 Mar 2008 19:28:46 +0200] rev 6320
tests: update test-command-template for the new {isodatesec} filter
Giorgos Keramidas <keramida@ceid.upatras.gr> [Mon, 17 Mar 2008 19:17:54 +0200] rev 6319
Add an {isodatesec} template, to show seconds too.
Eric Hopper <hopper@omnifarious.org> [Mon, 17 Mar 2008 12:41:14 -0700] rev 6318
convert: Add convert.cvsps option to set up an alternate cvsps command line.
Eric Hopper <hopper@omnifarious.org> [Mon, 17 Mar 2008 12:40:02 -0700] rev 6317
hgwebdir: Tiny fix for webdir on non-symlink capable platforms.
John Mulligan <phlogistonjohn@asynchrono.us> [Sat, 15 Mar 2008 12:22:15 -0400] rev 6316
Add tests for cloning from a all-history bundle
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 11:12:35 -0500] rev 6315
clone: use cancopy
John Mulligan <phlogistonjohn@asynchrono.us> [Sat, 15 Mar 2008 12:04:28 -0400] rev 6314
Add ability to directly clone from all-history bundles
bundlerepos can be used as clone src, even if CWD is not a repo
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 11:12:35 -0500] rev 6313
remoterepo: no longer needed
All users already use repo.local() to test for local, which is false
in the repository base class. statichttprepository never derived from
this class anyway.
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 11:12:35 -0500] rev 6312
repo classes: remove unused dev() method
John Mulligan <phlogistonjohn@asynchrono.us> [Sat, 15 Mar 2008 15:23:20 -0400] rev 6311
Add default local() and cancopy() methods to repository base class
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 07 Mar 2008 16:19:46 +0100] rev 6310
make hgrc man page tell about ~/.hgrc on Windows
"Peter Arrenbrecht" <peter.arrenbrecht@gmail.com> [Thu, 20 Mar 2008 11:12:35 -0500] rev 6309
ui: make chuild ui feed output to parentui's active buffer
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 11:12:35 -0500] rev 6308
convert: fix test complaint for mtn bits
Mikkel Fahnøe Jørgensen <mikkel@dvide.com> [Sun, 03 Feb 2008 16:14:05 +0100] rev 6307
cleanup monotone conversion and use commandline class
Mikkel Fahnøe Jørgensen <mikkel@dvide.com> [Sat, 02 Feb 2008 19:14:59 +0100] rev 6306
initial version of monotone source for convert extension
Benoît Allard <benoit@aeteurope.nl> [Thu, 20 Mar 2008 16:42:51 +0100] rev 6305
notify: print diffstat even if maxline == 0
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 20 Mar 2008 01:47:35 +0100] rev 6304
Make clear that for a changegroup '-r' pulls "up to" a revision
If some better wording is found, it can be changed later.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 19 Mar 2008 16:54:35 -0300] rev 6303
two fixes for the pager stuff
- open pipe in binary mode
- don't start a pager if stdout is not a tty (this prevents test-ssh
from hanging if you set ui.usepager=True in run-tests.py)
David Soria Parra <dsp@php.net> [Tue, 18 Mar 2008 22:12:34 +0100] rev 6302
Use the pager given by the environment to display long output
Unix systems usually have a PAGER environment variable set.
If it is set, mercurial will use the pager application to display
output.
Two configuration variables are available to influence the behaviour of the
pager. ui.pager sets the pager application. The pager is
only used if ui.usepager is true. By default ui.usepager is disabled.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 18:14:59 -0300] rev 6301
Fix thinko in test-inherit-mode
If we don't change any rwx bit in the last test, hg will skip the
calls to chmod since it'll assume they're not needed.
This might fix things on BSD systems.
Patrick Mezard <pmezard@gmail.com> [Mon, 17 Mar 2008 16:15:43 +0100] rev 6300
test-serve: replace copy/paste with shell function
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6299
revert: update state of files in the "checkout" list
This can make a difference when there are filters involved and
decode(encode(working-dir-data)) != working-dir-data
even though
encode(decode(repo-data)) == repo-data
An example is a working dir file that uses only \n when you're using
the win32text extension.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6298
normallookup: during merges, restore the state saved by remove
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6297
dirstate.remove: during merges, remember the previous file state
We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').
We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6296
debugstate: add --nodates
This can be useful for tests.
Patrick Mezard <pmezard@gmail.com> [Mon, 17 Mar 2008 23:36:45 +0100] rev 6295
patch: fix corner case with update + copy patch handling (issue 937)
The self patching of files when diffed with a backup is a bit peculiar to me.
It makes sense in mpatch, that's less clear in mercurial patching code. Let's
document and preserve it for now.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 14:51:41 -0700] rev 6294
Merge
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 14:51:36 -0700] rev 6293
Backed out changeset 4b81eecc8aa2
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 08:04:09 -0700] rev 6292
Merge
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 07:59:23 -0700] rev 6291
Backed out changeset 91ac1726730a
Bryan O'Sullivan <bos@serpentine.com> [Sun, 16 Mar 2008 22:59:31 -0700] rev 6290
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Sun, 16 Mar 2008 22:59:04 -0700] rev 6289
issue 1003: send all data properly
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 16 Mar 2008 23:30:47 +0100] rev 6288
Remove unneeded "import os.path" again.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 16 Mar 2008 23:24:53 +0100] rev 6287
Spacing cleanup
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 16 Mar 2008 06:10:47 -0300] rev 6286
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
_repopath may be different from _path for workingfilectx when there
are renames involved.
Eric Hopper <hopper@omnifarious.org> [Sat, 15 Mar 2008 12:42:41 -0700] rev 6285
Change User-agent field in client to have a lot more info.
Eric Hopper <hopper@omnifarious.org> [Sat, 15 Mar 2008 12:42:34 -0700] rev 6284
Allow hgwebdir collections to follow symlinks.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 15 Mar 2008 22:03:18 -0300] rev 6283
Revert cfebb175704f, fixing the output of 2 tests
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 15 Mar 2008 22:03:18 -0300] rev 6282
test-mv-cp-st-diff: avoid linkrev collisions
The copy detection code relies heavily on the linkrevs, so it's better
to avoid collisions in this test.
Patrick Mezard <pmezard@gmail.com> [Sun, 16 Mar 2008 00:35:14 +0100] rev 6281
convert: avoid querying log of foreign svn branches
Server configuration may prevent access to other branches, so don't even try to
get them, instead of ignoring them afterwards.
Patrick Mezard <pmezard@gmail.com> [Sun, 16 Mar 2008 00:35:12 +0100] rev 6280
patch: check filename is /dev/null for creation or deletion (issue 1033)
Otherwise, file creation or deletion is ambiguous with file being filled or
emptied.
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:51:53 -0500] rev 6279
update tests for copy detection changes
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:49:27 -0500] rev 6278
copies: add tests for status -C/diff --git
This goes through 42 combinations of copy/rename branch/parent/working dir.
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:25:27 -0500] rev 6277
copies: deal with symmetric difference for linear relationships
choose the minimum of symmetric difference and the two revs in question
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:24:16 -0500] rev 6276
status: find copies and renames beyond the working directory
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6275
diff: use copy smarts from copies.py
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6274
copies: move findcopies code to its own module
- pass in contexts
- fold symmetricdifference check into copies.copies
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6273
merge: move symmetricdifferences to ancestor.py
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6272
merge: simplify some helpers
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6271
merge: more simplifications to checkcopies
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6270
merge: simplify checkcopies
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6269
merge: privatize some functions, unnest some others
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 11:01:31 -0500] rev 6268
merge: notice uncommited copies (issue1000)
As mentioned in msg5349 in issue988, "hg update" doesn't take into account
uncommitted copies. To reproduce:
----------------
hg init repo
cd repo
touch foo
hg ci -Am 'add foo'
echo >> foo
hg ci -m 'change foo'
hg up -C 0
hg mv foo bar
HGMERGE=false thg --debug -y update
--------------------------
A similar problem happens with hg merge --force.
I'm attaching a possible patch.
Eric Hopper <hopper@omnifarious.org> [Sun, 02 Mar 2008 08:51:02 -0800] rev 6267
Check for patches repo with os.path.isdir not os.path.exists
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 21:57:46 -0300] rev 6266
hook.py: fix redirections introduced by 323b9c55b328
The only non-obvious part is the use of sys.{__stderr__,__stdout__},
which is needed because sshserver overrides sys.stdout.
This makes a test that I added back in revision 7939c71f3132 ineffective.
Jesse Glick <jesse.glick@sun.com> [Mon, 25 Feb 2008 09:55:57 -0500] rev 6265
Issue937: error messages from hooks not sent over HTTP.
Turns out that stderr - where ui.warn would send messages - was not
being proxied over the HTTP connection. stdout was, and it seems you
need both. (The streams are interleaved for readability.)
Tested on Ubuntu 7.10 with lighttpd on hgweb.cgi with HTTP Basic auth,
no SSL, using a changeset failing win32text.forbidcrlf.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 20:01:50 -0300] rev 6264
revlog.py: remove extra close()
atomictempfile.rename() already calls close().
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 14 Mar 2008 23:51:58 +0100] rev 6263
adjust test-http output to non-default HGPORT, e.g. with run-tests.py -j
Stephen Deasey <sdeasey@gmail.com> [Mon, 10 Mar 2008 19:25:34 +0000] rev 6262
hgweb: clarify which address and port can/cannot be bound at startup (bug 769)
The error message at startup when the address/port could not be bound
was confusing:
hg serve
abort: cannot start server: Address already in use
Be more explicit:
$ hg serve -a localhost
abort: cannot start server at 'localhost:8000': Address already in use
Also be more explicit on success, showing hostname and ip address/port:
$ hg -v serve -a localhost -p 80
listening at http://localhost/ (127.0.0.1:80)
We are careful to handle a missconfigured machine whose hostname does not
resolve, falling back to the address given at the command line.
Remove a dead-code error message.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 14 Mar 2008 22:12:50 +0100] rev 6261
revlog: make sure the files are closed after an exception happens
This prevents a corruption when the writes happen after the truncate
initiated by the transaction rollback.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 14 Mar 2008 21:36:09 +0100] rev 6260
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 14 Mar 2008 21:35:49 +0100] rev 6259
make sure not to reuse an existing append-file from a previous failed pull
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 10:32:19 -0300] rev 6258
Fix issue995 (copy --after and symlinks pointing to a directory)
I haven't looked at other places that call os.path.isdir to make
sure they're OK.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6257
dirstate: ignore mode changes if the fs does not supports the exec bit
This can make a difference when e.g. the repo is exported through NFS
(which support exec bits) and CIFS (which does not).
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6256
merge: require --force when there are deleted files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6255
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6254
localrepo.commit: normalize commit message even for rawcommit.
This normalization consists of:
- stripping trailing whitespace
- always using "\n" as the line separator
I think the main reason rawcommit was skipping this normalization was
an attempt to preserve hashes during an hg->hg conversion.
While this is a nice goal, it's not particularly interesting in
practice. Since SHA-1 is so strong, the only safe way to do it is to
have absolutely identical revisions. But:
- if the original revision was created with a recent version of hg,
the commit message will be the same, with or without that
normalization
- if it was created with an ancient version of hg that didn't do any
normalization, even if the commit message is identical, the file list
in the changelog is likely to be different (e.g. no removed files),
and there were some old issues with e.g. extra file merging, which
will end up changing the hash anyway
- in any case, if one *really* has to preserve hashes, it's easier
(and faster) to fake a partial conversion using something like:
hg clone -U -r rev orig-repo new-repo
hg -R new-repo log --template '#node# #node#\n' > new-repo/.hg/shamap
Additionally, we've had some reports of problems arising from this lack
of normalization - e.g. issue871, and a user that was wondering why
hg export/hg import was not preserving hashes when there was nothing
unusual going on (it was just import doing the normalization that had
been skipped).
This also means that it's even more unlikely to get identical revisions
when going $VCS->hg->$VCS.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6253
debugancestor: use repo.lookup when no revlog was specified
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6252
update output of test-hgweb
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 01:45:17 -0300] rev 6251
setup.py: use a simplified custom version of CCompiler.has_function
The original one doesn't remove its temporary files and even creates
a temporary file in the CWD.
Florent Guillaume <fg@nuxeo.com> [Thu, 13 Mar 2008 23:45:36 +0100] rev 6250
gitweb: show branches in most of the templates
Florent Guillaume <fg@nuxeo.com> [Thu, 13 Mar 2008 23:45:35 +0100] rev 6249
hgweb_mod: add branch helper functions to use in templates
Bryan O'Sullivan <bos@serpentine.com> [Thu, 13 Mar 2008 19:53:02 -0700] rev 6248
Automated merge with http://hg.intevation.org/mercurial/crew
Christian Ebert <blacktrash@gmx.net> [Thu, 13 Mar 2008 10:42:46 +0100] rev 6247
win32text: use util.binary to detect \0
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 14 Mar 2008 01:39:15 +0100] rev 6246
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 13 Mar 2008 19:50:03 -0300] rev 6245
setup.py: skip inotify if there's no inotify_add_watch
Debian Etch doesn't include a sys/inotify.h header, which makes it
impossible to compile _inotify.c, making hg uninstallable.
The cc.has_function() method is implemented by trying to compile a
simple C program. Since there's no redirection involved all error
messages are sent to the terminal. This is not particularly pretty
but at least it allows the installation to complete.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 13 Mar 2008 17:39:30 +0100] rev 6244
run-tests.py: add a summary of failed tests at the end
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 13 Mar 2008 15:40:41 +0100] rev 6243
fix incorrect date when committing a tag
regression introduced by 989467e8e3a9
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.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 27 Feb 2008 14:58:44 -0800] rev 6178
debugancestor: make the index argument optional, defaulting to 00changelog.i
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 26 Feb 2008 22:42:37 +0100] rev 6177
Renamed "manifest" to "files" in web templates.
manifest.tmpl is still used, so people having their own templates don't have
to change them. "cmd=manifest" still works, new style URLs are not affected,
because they already used "/file/".
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 26 Feb 2008 22:21:34 +0100] rev 6176
Removed old-style hgweb templates
Steve Borho <steve@borho.org> [Tue, 26 Feb 2008 06:25:11 -0600] rev 6175
add explicit extension disabling syntax to hgrc.5
Jesse Glick <jesse.glick@sun.com> [Mon, 28 Jan 2008 22:19:12 -0500] rev 6174
Permit XML entities to be escaped in template output.
Useful for creating XML documents directly from Hg logging. Can also be used for
HTML. For use in content, will escape '&', '<', and for completeness '>'
(although it is not strictly necessary). For use in attributes, will also escape
' and ". Will also replace nonprinting (ASCII) control characters with spaces,
since these are illegal in XML.
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Feb 2008 17:58:55 +0100] rev 6173
convert: add shallow, single branch svn conversions via svn.startrev
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Feb 2008 17:58:53 +0100] rev 6172
convert: allow svn trunk/branches/tags detection to be skipped
- eluding convert.svn.branches defaults to "branches"
- convert.svn.branches= disables branches detection
- convert.svn.branches=/ is equivalent to former convert.svn.branches=
John Mulligan <phlogistonjohn@yahoo.com> [Thu, 21 Feb 2008 08:24:58 -0500] rev 6171
Add --all option to bundle command
Patrick Mezard <pmezard@gmail.com> [Sat, 23 Feb 2008 19:37:44 +0100] rev 6170
Fix test-convert.out after 55455556f921
Patrick Mezard <pmezard@gmail.com> [Sat, 23 Feb 2008 16:43:33 +0100] rev 6169
convert: improve subversion source documentation
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 23 Feb 2008 11:19:59 +0100] rev 6168
hgweb: fix parameter mixup (issue1001)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 23 Feb 2008 11:18:34 +0100] rev 6167
tests: easier hg serve error diagnosis
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 21 Feb 2008 20:56:06 +0100] rev 6166
util: make walkrepos() return .hg/patches if present
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Feb 2008 21:58:15 +0100] rev 6165
Allow "file://localhost/" in addition to "file:///" (issue728)
file://localhost/ URLs are generated by Mac OS X API calls like
[NSURL fileURLWithPath:].
Imported patch from Paul Bx.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 21 Feb 2008 23:00:50 +0100] rev 6164
mq: make qclone ask remote source repo for qbase using lookup protocol
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Feb 2008 21:18:48 +0100] rev 6163
Document log date ranges and mention 'hg help dates' for all commands (issue998)
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Feb 2008 11:28:14 +0100] rev 6162
Add test case for backout on named branches (issue665)
Gilles Moris <gilles.moris@free.fr> [Thu, 21 Feb 2008 08:52:52 +0100] rev 6161
Reverse the way backout is doing the merge
Currently, backout is creating a backout revision as a child node of the
backed out node and will leave you at this new head. This has several
drawbacks:
* this changes the current head
* when there is a long history between the backed out node and the
current head, this will generate a huge number of diffs that are scary
at first sight, and not very natural to review before commit.
The change consists to switch back to the original node as soon as the
backout node (which becomes the new tip) has been created. Then the
--merge option can just merge this new tip in the current node.
* the current head/node is not changed from the user's point of view
* even without using the --merge option, the backout revision is still
easy to locate, as this is the tip
* the merge is much more intuitive as diffs of the merge is right you
are looking to backout
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Feb 2008 16:22:31 -0300] rev 6160
tests: hide the name of the branch cache file
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Feb 2008 16:22:31 -0300] rev 6159
test-mq-pull-from-bundle: don't print the contents of $HGRCPATH
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Feb 2008 16:22:31 -0300] rev 6158
repo.status: also compare flags for files in the lookup list.
We might be able to do something smarter about this in dirstate.status
for files in normallookup state, but that would require some extra
care to keep backwards compatibility.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Feb 2008 16:22:31 -0300] rev 6157
keyword: remove "identify" and "remove" from nokwcommands
These two commands care about the list of modified files returned
by repo.status and we may need to do a full content comparison to
populate that list.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Feb 2008 16:22:31 -0300] rev 6156
test-glog: pass the list of files to commit
test-glog uses debugsetparents instead of update+merge to create
some funky DAGs, and so the dirstate contents won't be consistent
with the checked out revision.
Passing an explicit list of files to commit reduces a bit the
dependency on the dirstate.
Using a non-deprecated rawcommit might be better here.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 21 Feb 2008 15:56:35 +0100] rev 6155
hgweb: no i18n in protocol responses
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 21 Feb 2008 17:02:28 +0100] rev 6154
improve changegroup.readbundle(), use it in hgweb
Stefan Rank <strank(AT)strank(DOT)info> [Wed, 20 Feb 2008 21:31:42 +0100] rev 6153
Also search for .hgrc if mercurial.ini not found on windows
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 21 Feb 2008 15:00:25 +0100] rev 6152
hgweb: use bundletypes from mercurial.changegroup
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Feb 2008 13:38:16 -0800] rev 6151
Merge with crew
Jesse Glick <jesse.glick@sun.com> [Fri, 25 Jan 2008 04:11:32 -0500] rev 6150
Infer a --repository argument from command arguments when reasonable.
In particular: if invoked without -R from a CWD not inside a repo, having been
passed one or more file paths as command arguments, where the nearest enclosing
repo of all of those paths is the same, quietly infer a -R option for that repo.
Otherwise abort with an error message as before.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 20 Feb 2008 10:50:10 +0100] rev 6149
hgweb: separate protocol calls from interface calls (issue996)
The protocol functions are already pretty careful about not raising
exceptions to the caller, and have their own error handling. We can formalize
this a little bit to make it clearer (before, the exception handlers for
a limited number of exceptions coming from the interface bits would blow up
because some variables aren't instantiated for the protocol calls).
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 19 Feb 2008 19:34:18 -0300] rev 6148
update output of test-convert
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 19 Feb 2008 19:20:10 -0300] rev 6147
repair.py: rewrite a loop, making it cleaner and faster
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 19 Feb 2008 19:20:10 -0300] rev 6146
Speed up hg grep by avoiding useless manifest parsing
In the kernel repo (tip = 2b89f7111b96), a "hg grep mpm MAINTAINERS" goes
from ~165s to 0.7s. This could get even a bit faster if we broke out of
the loop after the first match, but I'm not sure how that would interact
with the --follow code.
This is obviously an extreme example, but other cases should also benefit
from this patch.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 19 Feb 2008 19:20:10 -0300] rev 6145
cmdutil.walkchangerevs: use '-1:0' instead ot 'tip:0'
This avoids a possibly expensive tag lookup.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 19 Feb 2008 19:20:10 -0300] rev 6144
revlog.revision: avoid opening the datafile without need.
If there's no inline data, revlog.revision opens the data file every
time it's called. This is useful if we're going to call chunk many
times, but, if we're going to call it only once, it's better to let
chunk open the file - if we're lucky, all the data we're going to need
is already cached and we won't need to even look at the file.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 19 Feb 2008 10:53:40 -0800] rev 6143
convert: document splicemap, allow setting of multiple parents
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 18 Feb 2008 19:21:33 +0100] rev 6142
merge backout
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 18 Feb 2008 19:20:22 +0100] rev 6141
Backed out changeset b913d3aacddc (see issue971/msg5317)
Walter Doerwald <walter@livinglogic.de> [Tue, 28 Aug 2007 18:00:07 +0200] rev 6140
Simplify utils.walkrepos().
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 17 Feb 2008 21:34:28 +0100] rev 6139
Fix bad behaviour when specifying an invalid date (issue700)
commit (aborts _after_ typing in a commit message)
backout (aborted after the initial revert)
tag (edited .hgtags and couldn't commit)
import (patch applied, then commit fails)
qnew (aborts on bad dates, but writes any valid date into the # Date header)
qrefresh (like qnew)
sign (like tag)
fetch (merge, merge, merge, merge, abort)
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 17 Feb 2008 12:53:57 +0100] rev 6138
Report filenames with disallowed characters as suggested by Mika Eloranta
(see issue671)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 16 Feb 2008 18:12:30 +0100] rev 6137
hgweb: Quote filenames when downloading raw files.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 16 Feb 2008 17:51:30 +0100] rev 6136
hgweb: Pass only filename instead of full path when downloading raw files.
Before this patch "filename=foo/bar" was sent and e.g. Firefox offered to save
the file as "foo-bar" instead of just "bar".
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 16 Feb 2008 13:34:11 +0100] rev 6135
merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 16 Feb 2008 13:33:38 +0100] rev 6134
Make annotae/grep print short dates with -q/--quiet.
Move shortdate() from templatefilters to util to avoid code duplication.