Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 20 Mar 2007 22:09:51 -0300] rev 4252
fix hg commit . in the repo root
Brendan Cully <brendan@kublai.com> [Tue, 20 Mar 2007 13:13:39 -0700] rev 4251
transplant: fix ignoring empty changesets (eg after filter)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 19 Mar 2007 19:16:35 -0300] rev 4250
Merge with crew-stable.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 19 Mar 2007 19:07:40 -0300] rev 4249
debugsetparents: wlock the repo before updating the dirstate
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 19 Mar 2007 19:07:39 -0300] rev 4248
avoid _wsgioutputfile <-> _wsgirequest circular reference
We use the _wsgirequest object itself as the output file object.
To avoid a "self.out = self" which would create another circular
reference, we make the "out" attribute a trivial property.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 19 Mar 2007 19:07:38 -0300] rev 4247
avoid wsgiapplication <-> MercurialHTTPServer circular reference
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 19 Mar 2007 19:07:37 -0300] rev 4246
hgwebdir: break templater -> templater circular reference
This is essentially another instance of the same problem fixed
by the parent changeset. See its commit message for the details.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 19 Mar 2007 19:07:35 -0300] rev 4245
hgweb: break templater -> templater circular reference
The problem were some functions passed in the "defaults" argument
during the templater creation which use "self.t" directly. This
creates the cycle:
hgweb object
-> templater object
-> defaults dict
-> footer function
-> hgweb object
Instead of completely avoding the cycle, we break it after using
the templater.
Brendan Cully <brendan@kublai.com> [Mon, 19 Mar 2007 09:36:06 -0700] rev 4244
Add hg-relink script to contrib
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 18 Mar 2007 20:44:58 +0100] rev 4243
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 18 Mar 2007 20:39:25 +0100] rev 4242
Fixed synopsis for some mq commands
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 18 Mar 2007 20:37:47 +0100] rev 4241
hg qseries -m: guards file was not ignored
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 18 Mar 2007 19:41:28 +0100] rev 4240
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 18 Mar 2007 12:20:15 +0100] rev 4239
Simplified qseries and hg qapplied to fix some bugs caused by optimization:
- hg qapplied -v now works consistendly to hg qunapplied -v, i.e. showing
guarded (or unapplied because they were guarded during hg qpush) patches.
- hg qapplied <patchname> now works again
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 17 Mar 2007 18:46:52 +0100] rev 4238
Fix issue443: inconsistent output of "hg qunapplied -v"
1. Don't skip over unpushable (guarded) unapplied patches.
2. Don't display unpushable patches, unless -v is given, otherwise
guarded and unguarded patches can't be distinguished.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 22:58:49 -0300] rev 4237
Merge some matcher fixes/cleanups and add some more hg locate tests
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 22:48:23 -0300] rev 4236
util._matcher: remove superfluous variable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 22:48:22 -0300] rev 4235
add some more tests to hg locate
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 22:48:21 -0300] rev 4234
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 22:48:20 -0300] rev 4233
util._matcher: use "." as the root of empty {rel,}path patterns
Should fix issue332. Really.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 00:45:18 -0300] rev 4232
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 00:22:59 -0300] rev 4231
avoid a traceback with hg branch newbranch; hg up
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 00:22:58 -0300] rev 4230
Fix handling of paths when run outside the repo.
The main problem was that dirstate.getcwd() returned just "",
which was interpreted as "we're at the repo root". It now returns
an absolute path.
The util.pathto function was also changed to deal with the "cwd is
an absolute path" case.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 00:22:57 -0300] rev 4229
pass repo.root to util.pathto() in preparation for the next patch
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 00:22:55 -0300] rev 4228
hgweb: handle IOErrors and OSErrors during unbundle
This allows the client to display a reasonable message to the user
(e.g. "Permission denied: .hg/lock"), instead of the current
"<url> does not appear to be an hg repository".
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 22 Oct 2006 13:54:43 -0300] rev 4227
hgweb.unbundle: call req.httphdr only after the last possible call to bail
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 00:22:53 -0300] rev 4226
Work around a urllib2 bug in Python < 2.4.2
When urllib2 base64-encodes the password needed for the Proxy-authorization
header, it forgets to remove the trailing "\n". Later, a "\r\n" sequence
is appended to every header, as required by the standard.
Some proxies interpret the resulting "\n\r\n" sequence in the same way as
"\r\n\r\n": end of headers. This usually doesn't cause trouble for this
request, but when the proxy tries to read the next one, it thinks the
request starts with some garbage and returns a "400 - Bad Request" error.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 00:22:52 -0300] rev 4225
Fix confusing message from hg revert (issue332)
% mkdir sub1
% touch sub1/file1
% hg add sub1/
adding sub1/file1
% hg rev sub1
sub1: No such file in rev e4c586763258
forgetting sub1/file1
Matt Mackall <mpm@selenic.com> [Thu, 15 Mar 2007 18:57:47 -0500] rev 4224
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 15 Mar 2007 18:55:53 -0500] rev 4223
Merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 15 Mar 2007 18:38:46 -0500] rev 4222
revlog: attempt to gracefully handle some interleaved damage
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 15 Mar 2007 09:51:44 +0100] rev 4221
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 15 Mar 2007 09:49:45 +0100] rev 4220
Merge with hg-stable
Brendan Cully <brendan@kublai.com> [Wed, 14 Mar 2007 18:01:24 -0700] rev 4219
Merge with mpm
Matt Mackall <mpm@selenic.com> [Wed, 14 Mar 2007 19:17:40 -0500] rev 4218
Merge with -stable
Matt Mackall <mpm@selenic.com> [Wed, 14 Mar 2007 19:13:04 -0500] rev 4217
tags: add --remove
Matt Mackall <mpm@selenic.com> [Wed, 14 Mar 2007 18:49:10 -0500] rev 4216
tags: remove unused variables
Matt Mackall <mpm@selenic.com> [Wed, 14 Mar 2007 18:47:29 -0500] rev 4215
Make the tags algorithm smarter
Matt Mackall <mpm@selenic.com> [Wed, 14 Mar 2007 16:40:47 -0500] rev 4214
Refactor tags code to prepare for improving the algorithm
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 14 Mar 2007 22:43:57 +0100] rev 4213
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 14 Mar 2007 22:38:40 +0100] rev 4212
Only hg repositories override [paths], not simple directories (fixes issue510)
Brendan Cully <brendan@kublai.com> [Wed, 14 Mar 2007 11:46:07 -0700] rev 4211
git-send-email compatibility: stop reading changelog after ^---$
Brendan Cully <brendan@kublai.com> [Wed, 14 Mar 2007 10:45:18 -0700] rev 4210
mq: add qparent tag (first parent of qbase)
Matt Mackall <mpm@selenic.com> [Wed, 14 Mar 2007 01:26:09 -0500] rev 4209
Merge with -stable, fix small test failure
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2007 18:53:23 -0500] rev 4208
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2007 18:50:02 -0500] rev 4207
Move branch read/write to dirstate where it belongs
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2007 15:47:55 -0500] rev 4206
Minor default branch cleanups
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2007 15:18:10 -0500] rev 4205
Move branches.cache to branch.cache
Keeps old clients from conflicting with new caches, makes features
logic unnecessary.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 13 Mar 2007 15:02:33 -0300] rev 4204
"default" is the default branch name
Brendan Cully <brendan@kublai.com> [Tue, 13 Mar 2007 21:54:34 -0700] rev 4203
Make [PATCH] removal slightly more robust
Brendan Cully <brendan@kublai.com> [Tue, 13 Mar 2007 21:50:42 -0700] rev 4202
Remove undo log after mq operations that rollback would break
Brendan Cully <brendan@kublai.com> [Tue, 13 Mar 2007 16:27:34 -0700] rev 4201
Refresh file size after partial qrefresh.
This makes a subsequent hg revert; hg status work.
Brendan Cully <brendan@kublai.com> [Sun, 11 Mar 2007 14:21:09 -0700] rev 4200
Clarify update help text for update without an explicit revision
Brendan Cully <brendan@kublai.com> [Mon, 12 Mar 2007 15:02:59 -0700] rev 4199
Improve hg branch -f help text
Brendan Cully <brendan@kublai.com> [Mon, 12 Mar 2007 14:50:19 -0700] rev 4198
Add test for branch shadowing
Brendan Cully <brendan@kublai.com> [Mon, 12 Mar 2007 14:44:14 -0700] rev 4197
branch: require --force to shadow existing branches
Brendan Cully <brendan@kublai.com> [Mon, 12 Mar 2007 13:58:06 -0700] rev 4196
Strip [PATCH...] from message subject when importing patches
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:21:33 -0300] rev 4195
Merge a bunch of matcher and locate fixes.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:01:02 -0300] rev 4194
Optimize return value of util._matcher for hgignore case
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:01:00 -0300] rev 4193
Optimize return value of util._matcher for common command line case
This will trigger every time somebody runs something like "hg diff"
or "hg status" without any arguments.
The important part here is returning util.always as the match function,
which is a much simpler (and faster) function than the usual return
value, and allows other code to just skip the filtering if it knows
all files will match.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:59 -0300] rev 4192
remove unused "head" hack from util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:58 -0300] rev 4191
locate: exit(1) if we didn't print any file
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:57 -0300] rev 4190
change locate to use relglobs by default
This makes its default behaviour useful again (issue108), and
changes it search the entire repository by default (instead
of just the cwd), just like all other commands.
It also hides issue204 by default, but you'll still see the
same behaviour if you give it a relpath: pattern.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:55 -0300] rev 4189
localrepo.walk: if we're walking a specific revision, sort the files
This is more consistent with our behaviour while walking the working directory.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:54 -0300] rev 4188
dirstate.statwalk: explicitly test for ignored directories
This removes a hack where we appended '/' to a dirname so that:
- it would not appear on the "dc" dict
- it would always be matched by the match function
This was a contorted way of checking if the directory was matched by
some hgignore pattern, and it would still fail with some uses of
--include/--exclude patterns.
Things would still work fine if we removed the check altogether and
just appended things to "work" directly, but then we would end up
walking ignored directories too, which could be quite a bit of work.
This allows further simplification of the match function returned by
util._matcher, and fixes walking the working directory with a
--include pattern that matches only the end of a name.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:53 -0300] rev 4187
util._matcher: unify pattern normalization
This should fix issue347.
It also highlights one issue with the directory walking code when
you have an --include pattern that matches the end of a filename.
This is fixed by the next patch.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:52 -0300] rev 4186
make the output of test-walk more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:51 -0300] rev 4185
util.*matcher: change default "names" argument
names=['.'] means "include (recursively) only files from the current subdir";
the function then did a hack to walk the whole tree. Clean that up.
This also fixes a problem where "--include ." works in a subdir, but not
on the tree root.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:49 -0300] rev 4184
util._matcher: fix handling of path: patterns
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:48 -0300] rev 4183
util._matcher: fix handling of relglob: patterns
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:47 -0300] rev 4182
A 'glob:foo?bar' pattern determines a root - the tree root
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:46 -0300] rev 4181
Leave normalization of patterns to util._matcher
Passing [] to util.cmdmatcher accidentally fixes walking of files
with "\n" in the name.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:45 -0300] rev 4180
util._matcher: update comments
This should match the code better. Except for bugs...
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:43 -0300] rev 4179
remove obsolete code from patch.diff
repo.status already does this filtering. If the caller supplies a set of
changes, it's his responsibility to filter out what he doesn't want.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:42 -0300] rev 4178
small globprefix fix
Brendan Cully <brendan@kublai.com> [Sat, 10 Mar 2007 17:45:32 -0800] rev 4177
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Sat, 10 Mar 2007 17:36:29 -0800] rev 4176
Test update to branch tip
Brendan Cully <brendan@kublai.com> [Sat, 10 Mar 2007 17:36:27 -0800] rev 4175
Make update with no node jump to the tip of the current branch
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 22:03:23 -0300] rev 4174
fix qrefresh'ing an empty patch
This is not superefficient (the commit will have to walk the whole tree),
but it works.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 22:03:22 -0300] rev 4173
statwalk: don't put self.root in the files list
That list is supposed to contain internal, normalized names ("/"-separated,
relative to the repo root), not OS-native paths.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 22:03:21 -0300] rev 4172
fix qclone to a remote repo
This fixes issue467. -stable still needs something like revision
55578a8d7e84 - mq: allow push if -r is given explicitly.
In the meantime, hg qpop -a; hg qclone . ssh://... is a workaround.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 22:03:20 -0300] rev 4171
Save an absolute path in repo.path
This should keep things working if the process changes directories
after creating a repo object.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Mar 2007 20:08:13 +0100] rev 4170
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Mar 2007 19:57:26 +0100] rev 4169
Add tests for .hg/branches.cache feature list.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Mar 2007 19:12:03 +0100] rev 4168
Add a features list to branches.cache to detect caches of old hg versions.
The leading space in the written file makes sure that the feature list never
can match an existing version, even if the first feature can be read as hex.
Additionally old hg versions display the id with --debug, too.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Mar 2007 18:09:02 +0100] rev 4167
Store empty (default) branch in branch cache, too.
Operations on this branch don't work otherwise.
Reading branches.cache had to be adjusted to allow an empty label.
Adjusted reading of the cache tip for symmetry, no functional change here.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 08 Mar 2007 20:08:24 -0300] rev 4166
small fixes for the parent patch
- format.usestore is a boolean option
- python wart: ("revlogv1") is a string, not a tuple
- only create a dummy changelog if we're using a store
- add a test
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2007 16:13:16 -0600] rev 4165
Merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2007 16:12:52 -0600] rev 4164
Allow disabling store format to work with absurdly long filenames
Michael Gebetsroither <michael.geb@gmx.at> [Thu, 08 Mar 2007 22:36:12 +0100] rev 4163
hgweb: use the given revision in the name of the archive
If you ask for an archive in hgweb by tagname the directory in the archive
should include the tagname not the changeset-id.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 07 Mar 2007 15:26:03 -0300] rev 4162
incoming/outgoing: print the name of the other repo
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 07 Mar 2007 15:26:00 -0300] rev 4161
localrepo.status: use manifest.find on "lookup" files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 07 Mar 2007 15:25:59 -0300] rev 4160
localrepo.status: fcmp gets a getnode function instead of the manifest
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 07 Mar 2007 15:25:58 -0300] rev 4159
fix manifest.find
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 07 Mar 2007 15:06:57 +0100] rev 4158
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 07 Mar 2007 15:06:32 +0100] rev 4157
Fix sed expression in test-notify to be more portable.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 06 Mar 2007 12:52:07 +0100] rev 4156
Fix help text for hg status -i
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 06 Mar 2007 17:45:50 -0300] rev 4155
purge.py: fix invocation of statwalk
Emanuele Aina <em@nerd.ocracy.org> [Tue, 27 Feb 2007 09:05:36 +0100] rev 4154
Delete the README for purge, putting the useful informations in comments
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:47 -0300] rev 4153
Delete the Purge class, refactoring Purge.purge() in dopurge()
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:46 -0300] rev 4152
Do not use 'self' in the purge() method
Avoid any reference to 'self' in Purge.purge() to allow its refactoring
in a simple function.
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:45 -0300] rev 4151
Use nested functions instead of object methods
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:44 -0300] rev 4150
Merge _remove_file() and _remove_dir() in a single function
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:43 -0300] rev 4149
Use "f in dirstate" instead of "dirstate.state(f) == '?'"
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:41 -0300] rev 4148
Reduce the absolute/relative path conversion in the purge extension
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:40 -0300] rev 4147
Make the purge extension use the statwalk walker from the dirstate object
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:39 -0300] rev 4146
Yield directories in dirstate.statwalk()
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:38 -0300] rev 4145
Add a test for the purge extension
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 05 Mar 2007 19:54:21 +0100] rev 4144
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 05 Mar 2007 19:48:21 +0100] rev 4143
Don't truncate tag and branch names after 30 chars (introduced 73860ffbe798)
with test added for a long (local) tag name.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 04 Mar 2007 18:42:31 +0100] rev 4142
patchbomb: Strip more than one trailing dot (and spaces between them)
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 04 Mar 2007 18:40:08 +0100] rev 4141
patchbomb: Allow to specify subject of single-patch-series (issue475)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 04 Mar 2007 14:35:11 -0300] rev 4140
test-abort-checkin: use a hook to abort the commit
This should make it more portable.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 04 Mar 2007 14:09:29 -0300] rev 4139
test-bad-extension: avoid printing the file name
This should make it simpler on windows
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 04 Mar 2007 14:04:42 -0300] rev 4138
make test-acl a bit more digestable for windows
Giorgos Keramidas <keramida@ceid.upatras.gr> [Fri, 23 Feb 2007 17:54:34 +0200] rev 4137
Create the parent directory when checking out symlinks.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Fri, 05 Jan 2007 21:28:49 +0200] rev 4136
Fix addremove for symlinks to non-existent files
Erling Ellingsen <erlingalf@gmail.com> [Sun, 18 Feb 2007 20:39:25 +0100] rev 4135
Avoid some false positives for addremove -s
The original code uses the similary score
1 - len(diff(after, before)) / len(after)
The diff can at most be the size of the 'before' file, so any small
'before' file would be considered very similar. Removing an empty file
would cause all files added in the same revision to be considered
copies of the removed file.
This changes the metric to
bytes_overlap(before, after) / len(before + after)
i.e. the actual percentage of bytes shared between the two files.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 04 Mar 2007 09:03:21 -0300] rev 4134
Merge with crew-stable
Christian Ebert <blacktrash@gmx.net> [Sat, 03 Mar 2007 17:54:13 +0100] rev 4133
mq: abort cleanly when invalid patch name is given to qguard
Andrei Vermel <avermel@mail.ru> [Mon, 19 Feb 2007 12:38:58 +0300] rev 4132
Close keepalive connections to fix server traceback
Erling Ellingsen <erlingalf@gmail.com> [Tue, 20 Feb 2007 22:20:16 +0100] rev 4131
don't return uninitialized memory from bdiff.blocks()
bdiff.blocks() returns a dummy match at the end of both files; the
length of that chunk is never set, so it will sometimes contain random
heap garbage. There are apparently workarounds for this elsewhere:
# bdiff sometimes gives huge matches past eof, this check eats them,
Patrick Mezard <pmezard@gmail.com> [Mon, 19 Feb 2007 10:08:59 +0100] rev 4130
web/server: disable address reuse option for BaseHTTPServer on windows
On windows, a socket with the SO_REUSEADDR option set is able to bind to
any port, even if there's already an active socket listening on it.
test-http: check server address cannot be reused.
Patrick Mezard <pmezard@gmail.com> [Mon, 19 Feb 2007 10:32:46 +0100] rev 4129
stdout raises EINVAL when flush() is called on a closed pipe under win32.
Maybe the exception should be caught and translated at raise location instead (sshserver.py).
Patrick Mezard <pmezard@gmail.com> [Mon, 19 Feb 2007 10:29:05 +0100] rev 4128
localrepo: stream_in may raise ZeroDivisionError with nul float elapsed argument.
Patrick Mezard <pmezard@gmail.com> [Mon, 19 Feb 2007 09:59:37 +0100] rev 4127
streamclone: stream_out tried to decodefilename non-normalized paths
Brendan Cully <brendan@kublai.com> [Sat, 03 Mar 2007 18:59:54 -0800] rev 4126
Add _xmlplus to the demandimport blacklist. (HGCIA was failing to load.)
Brendan Cully <brendan@kublai.com> [Fri, 02 Mar 2007 14:03:30 -0800] rev 4125
Suppress <stdout> before hg export -v (regression from previous patch).
Brendan Cully <brendan@kublai.com> [Thu, 01 Mar 2007 20:53:38 -0800] rev 4124
Let patch.export handle any fp-like object
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Mar 2007 22:15:56 +0100] rev 4123
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Mar 2007 22:15:17 +0100] rev 4122
Unified #! paths for python scripts and removed them for test modules.
Emanuele Aina <em@nerd.ocracy.org> [Tue, 27 Feb 2007 09:05:36 +0100] rev 4121
Use the mercurial i18n infrastructure in the purge extension
Emanuele Aina <em@nerd.ocracy.org> [Tue, 27 Feb 2007 09:05:36 +0100] rev 4120
Print relative names in the purge extension
Matt Mackall <mpm@selenic.com> [Tue, 27 Feb 2007 16:48:17 -0600] rev 4119
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 27 Feb 2007 16:47:16 -0600] rev 4118
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Feb 2007 16:20:06 -0600] rev 4117
merge: fix renaming of subdirectories under renamed directories
Brendan Cully <brendan@kublai.com> [Tue, 27 Feb 2007 12:58:40 -0800] rev 4116
Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 26 Feb 2007 21:57:33 +0100] rev 4115
Use only integer part of mtime in workingfilectx.date(), fixes test-context.py
Similar to what is done in dirstate.status() (changeset 882e703eaa94)
and has to be removed when Mercurial switches to subsecond granularity.
Matt Mackall <mpm@selenic.com> [Mon, 26 Feb 2007 12:12:29 -0600] rev 4114
Merge with crew
Matt Mackall <mpm@selenic.com> [Fri, 23 Feb 2007 14:16:50 -0600] rev 4113
Merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 22 Feb 2007 19:00:05 -0600] rev 4112
Merge with crew
Matt Mackall <mpm@selenic.com> [Wed, 21 Feb 2007 11:02:37 -0600] rev 4111
convert-repo: use .git/objects/ rather than .git/HEAD to detect git repos
Edouard Gomez <ed.gomez@free.fr> [Wed, 21 Feb 2007 00:38:06 +0100] rev 4110
Don't keep trailing white space in cvs tags
Edouard Gomez <ed.gomez@free.fr> [Wed, 21 Feb 2007 00:38:06 +0100] rev 4109
Change a bit cvsps arguments
- Force updating the cache
- Use internal cvs implementation, reducing overhead
- Use quiet mode
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 23 Feb 2007 17:31:00 +0100] rev 4108
Fixed workingfilectx.date() (found by Thomas Waldmann) with test.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 20 Feb 2007 20:55:23 +0100] rev 4107
merge with crew-stable
Christian Ebert <blacktrash@gmx.net> [Sat, 17 Feb 2007 09:54:44 +0100] rev 4106
test-notify: adapt to sed shipped with MacOS
MacOS X' sed does not have the \? repetition operator.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 17 Feb 2007 09:55:00 -0200] rev 4105
git binary patches: don't print the header for identical files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 17 Feb 2007 09:54:59 -0200] rev 4104
git binary patches: use hashes to detect identical files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 17 Feb 2007 09:54:58 -0200] rev 4103
add test for diffing identical binary files
tailgunner@smtp.ru [Sat, 17 Feb 2007 09:54:56 -0200] rev 4102
Don't lie that "binary file has changed"
Without -a option to "hg diff", mdiff.unidiff reported that "Binary
file foo has changed" without even trying to compare things. Now it
computes MD5 of old and new files, compares them and makes the conclusion.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 17 Feb 2007 04:50:06 -0200] rev 4101
add some tests for qpush/qpop error codes
Ben Thomas <bthomas@virtualiron.com> [Tue, 13 Feb 2007 08:54:48 -0500] rev 4100
Modify qpush/qpop idempotent operations to return success
Modify qpush/qpop such that idempotent instances of the operations
return success. That is, repeated qpush -a, qpop -a, qpush patch-name
or qpop patch-name will return success. The end goal of each of these
operations is to reach a particular state. Whether or not the patches
were already applied does not affect that state or operation status.
Likewise, be careful to retain the error status on a qpush/qpop
without arguments when the end/beginning of the series has been
reached.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 17 Feb 2007 04:50:03 -0200] rev 4099
mq: propagate the return error of pop
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Feb 2007 05:53:03 -0200] rev 4098
util_win32.py: fix user_rcpath
Fixes issue504.
Shane Holloway <shane.holloway@ieee.org> [Thu, 15 Feb 2007 09:51:57 -0700] rev 4097
Combined the two os_rcpath methods into a single one near rcpath in mercurial/util.py
The os_rcpath method delegates to system_rcpath and user_rcpath from the
different platform implementations.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Feb 2007 05:27:37 -0200] rev 4096
merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Feb 2007 05:10:43 -0200] rev 4095
hgweb: catch util.Abort raised by addchangegroup
Right now, if a pretxnchangegroup hook fails, we send some HTML
error message to the client and the transaction is not rolled back
(issue499).
Catching util.Abort allows us to send a decent message to the client
and for some reason makes the rollback complete.
This patch is not perfect since it doesn't fix the reason why the
transaction wasn't rolled back (maybe some circular references?).
Also, the transaction is aborted only after we've sent the response
back to the client and the "transaction aborted" message ends up in
the logs of the web server.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Feb 2007 04:54:49 -0200] rev 4094
notify: don't try to fix addresses if notify.domain is not set
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Feb 2007 04:54:47 -0200] rev 4093
mail.py: don't try to use TLS if python doesn't have SSL support
This should hide the traceback from issue501.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Feb 2007 04:54:46 -0200] rev 4092
git patches: handle renames of binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 15 Feb 2007 08:49:20 -0200] rev 4091
hgweb/server.py: use hg.repository to create a repo object
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 15 Feb 2007 08:44:08 -0200] rev 4090
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 15 Feb 2007 08:14:03 -0200] rev 4089
extdiff: open files in binary mode
Problem noticed by Darrell Gallion.
Andrei Vermel <avermel@mail.ru> [Thu, 15 Feb 2007 12:51:43 +0300] rev 4088
Make extdiff work at root directory
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 15 Feb 2007 05:38:00 -0200] rev 4087
Fix util.shellquote on windows.
Jun Inoue <jun.lambda@gmail.com> [Thu, 15 Feb 2007 05:18:23 -0200] rev 4086
Fix accessing the repo through a symlink.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 15 Feb 2007 10:15:08 -0200] rev 4085
Fix hg showconfig traceback with values that aren't strings
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 15 Feb 2007 08:51:32 -0200] rev 4084
hgweb: allow static files to be served directly by the HTTP server
Shane Holloway <shane.holloway@ieee.org> [Wed, 14 Feb 2007 15:20:06 -0700] rev 4083
Unified *_rcpath so the interface is similar across operating systems
Changed os_rcpath to combine system_rcpath and user_rcpath. Changed
system_rcpath and user_rcpath to both return a list of paths to add to the
combined rcpath for both Windows NT and other platforms.
Daniel Holth <dholth@fastmail.fm> [Tue, 30 Jan 2007 23:09:06 -0500] rev 4082
convert-repo converts symlinks from git
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 13 Feb 2007 10:25:45 -0200] rev 4081
merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 13 Feb 2007 10:02:07 -0200] rev 4080
hgwebdir: try to get web.style and web.motd from the ui.config system
This finishes fixing issue253. As a bonus, web.style and web.motd
settings from ~/.hgrc will be used for the hgwebdir index page.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 13 Feb 2007 10:01:44 -0200] rev 4079
Pass a ui from create_server to hgwebdir and a repo from hgwebdir to hgweb
This allows repo pages to respect hg serve --webdir-conf <file> --style=gitweb
(part of issue253).
Since we're creating a ui object anyway, use it as the parentui of the ui
objects created for every repo entry. This has the unintended side-effect
that --name=foo on the command line will set the name of all repos.
If one of the repos being served has a .hg/hgrc owned by a user that is not
trusted, hg will now print the "Not trusting file..." warning when reading
it. This is consistent with the behaviour from a hg serve from inside the
repo.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 13 Feb 2007 10:00:17 -0200] rev 4078
hg serve: call setconfig on the parentui
It makes sense to do this on the "global" ui object, since command line
options should affect the whole process.
This should fix hg serve --style=gitweb inside a repo (part of issue253).
Sean Dague <sean@dague.net> [Tue, 30 Jan 2007 10:35:25 -0500] rev 4077
Prevent type exception on concatenation if diffstat returns None.
This will most often occur if diffstat is not installed in the
target platform, though may also happen in other cases where
diffstat fails to execute.
Signed-off-by: Sean Dague <sean@dague.net>
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 13 Feb 2007 06:50:00 -0200] rev 4076
Switch CGI stdout to binary on windows
Problem diagnosed by Andrei Vermel.
Andrei Vermel <avermel@mail.ru> [Fri, 09 Feb 2007 20:50:41 +0300] rev 4075
Fix dirstate fail at drive root on Windows
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 08 Feb 2007 16:31:21 -0200] rev 4074
Try to pass repo.ui to reposetup hooks
The ui object we received in this function may belong to another repo,
which could be confusing from the hook point of view. Trying to use
the ui object from the newly created repo should avoid this confusion.
Andrew Bachmann <andrewbachmann@gmail.com> [Tue, 02 Jan 2007 21:40:20 -0800] rev 4073
BeOS compatibility support
Patrick Mezard <pmezard@gmail.com> [Sun, 11 Feb 2007 18:37:23 +0100] rev 4072
transplant: remote bundle source was not closed before deleting the fetched bundle.
It fails under win32 because "normal" opened files cannot be removed.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 09 Feb 2007 03:48:30 -0200] rev 4071
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 09 Feb 2007 03:48:28 -0200] rev 4070
Handle functions as the value of a hooks.<name> config variable
This should make it easier for extensions to add a hook when
they're loaded.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 09 Feb 2007 03:48:26 -0200] rev 4069
allow values that aren't strings in util.configparser
Matt Mackall <mpm@selenic.com> [Tue, 06 Feb 2007 16:12:22 -0600] rev 4068
Merge with stable
Andrei Vermel <avermel@mail.ru> [Tue, 06 Feb 2007 00:09:36 +0300] rev 4067
Fix wrong module reference in copyfile exception
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 06 Feb 2007 15:55:20 -0200] rev 4066
setup.py: reload __version__.py after writing it.
write_version loads __version__.py before writing it (see 7eb694a1c1af),
so we have to explicitly reload it to use the correct version.
Problem diagnosed by Christian Ebert.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 06 Feb 2007 15:54:58 -0200] rev 4065
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 06 Feb 2007 15:43:01 -0200] rev 4064
install reposetup hook right after loading the extension
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 30 Jan 2007 20:37:58 -0200] rev 4063
Open bundle files in binary mode
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 06 Feb 2007 15:23:40 -0200] rev 4062
convert-repo: handle packed git tags
Brendan Cully <brendan@kublai.com> [Sun, 04 Feb 2007 16:08:56 -0800] rev 4061
lazyindex: handle __delitem__ in loadblock