Matt Mackall <mpm@selenic.com> [Thu, 05 Apr 2007 16:25:47 -0500] rev 4309
merge: fix a bug where copies were getting ignored
Emanuele Aina <em@nerd.ocracy.org> [Tue, 27 Feb 2007 09:05:36 +0100] rev 4308
Move back the purge extension in hgext
Emanuele Aina <em@nerd.ocracy.org> [Wed, 28 Mar 2007 21:34:12 +0200] rev 4307
purge: abort with missing files avoiding problems with name-mangling fs
In a name mangling filesystem (e.g. a case insensitive one)
dirstate.walk() can yield filenames different from the ones
stored in the dirstate. This already confuses the status and
add commands, but with purge this may cause data loss.
To prevent this purge refuses to work if there are missing
files and has a 'force' option if the user knows it is safe.
Even with the force option purge checks if any of the missing
files is still available in the working dir: if so there
may be some problem with the underlying filesystem, so it
unconditionally aborts.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 04 Apr 2007 04:22:08 -0300] rev 4306
Merge last few matcher/locate fixes.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 04 Apr 2007 04:22:06 -0300] rev 4305
locate: don't print "file not found" messages.
This should fix issue204.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 04 Apr 2007 04:22:06 -0300] rev 4304
change relglob: patterns to be consistent with glob: patterns
With this change, you have to use "hg locate 'hgweb/**'" to locate
all the files in directories named hgweb. OTOH, "hg locate '*l'"
will locate only files that end with "l" - e.g. a file called "hg.py"
will not be matched just because it's in a directory whose name ends
with "l" (e.g. "mercurial").
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 04 Apr 2007 04:22:05 -0300] rev 4303
Revert changeset ef1f1a4b2efb; add another test for glob: patterns
With that changeset, it's impossible to use a glob: pattern to match
e.g. all files ending in .py - glob:**.py would also match all files
in a directory called dir.py.
Matt Mackall <mpm@selenic.com> [Mon, 02 Apr 2007 14:16:44 -0500] rev 4302
Fixups for recent changes in revlog version handling
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:25 -0300] rev 4301
hgweb: don't display heads in gitweb-style summary page
greg@maptuit.com [Fri, 16 Mar 2007 17:55:42 -0400] rev 4300
hgweb: display named branches in gitweb-style summary page
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:23 -0300] rev 4299
test-ssh-clone-r: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:22 -0300] rev 4298
test-ssh: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:21 -0300] rev 4297
test-init: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:20 -0300] rev 4296
test-rename-merge2: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:18 -0300] rev 4295
test-merge6: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:17 -0300] rev 4294
test-merge1: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:16 -0300] rev 4293
test-filebranch: avoid a shell script
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sat, 30 Dec 2006 21:33:45 +0200] rev 4292
Use printf(1) instead of using bash-specific shell code.
Submitted by: Benoit Boissinot <bboissin@gmail.com>
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 23:50:04 -0300] rev 4291
test-ssh: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 23:50:03 -0300] rev 4290
test-static-http: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 23:50:01 -0300] rev 4289
test-http: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 23:50:00 -0300] rev 4288
test-push-http: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 23:49:59 -0300] rev 4287
test-bundle: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 23:49:58 -0300] rev 4286
test-hook: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 23:49:56 -0300] rev 4285
Add tests/printenv.py
This is a small script that can be used as a hook to print the
HG_* environment variables without relying on the shell.
John Goerzen <jgoerzen@complete.org> [Mon, 26 Mar 2007 20:49:57 -0500] rev 4284
Add a filename for the bundle
John Goerzen <jgoerzen@complete.org> [Mon, 26 Mar 2007 20:46:49 -0500] rev 4283
Slight refining to help text in patchbomb.py
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Mar 2007 13:17:26 +0100] rev 4282
hgweb: short hash for tip archive name
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 21:36:26 -0300] rev 4281
add util.lexists
John Goerzen <jgoerzen@complete.org> [Thu, 22 Mar 2007 14:02:39 -0500] rev 4280
Improve documentation for patchbomb and email
John Goerzen <jgoerzen@complete.org> [Mon, 26 Mar 2007 13:57:49 -0500] rev 4279
Add common bundle/outgoing options to hg email
John Goerzen <jgoerzen@complete.org> [Mon, 26 Mar 2007 13:37:48 -0500] rev 4278
Add ability to send bundles to patchbomb extension
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 24 Mar 2007 13:31:43 +0100] rev 4277
Fixed spacing in assignment of REVLOG_DEFAULT_VERSION
Matt Mackall <mpm@selenic.com> [Sat, 24 Mar 2007 02:57:27 -0500] rev 4276
Merge with crew
Matt Mackall <mpm@selenic.com> [Sat, 24 Mar 2007 02:47:33 -0500] rev 4275
changelog: optimize delayed updates for clone vs pull
pull index updates get redirected to memory, then appended on finalize
clone index updates get sent to 00changelog.i.a, then renamed on finalize
Matt Mackall <mpm@selenic.com> [Sat, 24 Mar 2007 02:45:08 -0500] rev 4274
Merge with -stable
Matt Mackall <mpm@selenic.com> [Fri, 23 Mar 2007 00:12:28 -0500] rev 4273
tags: require -f to replace an existing tag
based on a patch from Johan Herland <johherla@online.no>
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2007 23:52:50 -0500] rev 4272
tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com> [Fri, 23 Mar 2007 01:04:21 -0500] rev 4271
Merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2007 23:37:44 -0500] rev 4270
restructure changelog file appending
- make appending code proper part of changelog with delayupdate/finalize
- use simplified appender that tracks pending data in memory
- eliminate old appendfile and helper classes
- update addchangegroup to use new interface and reuse the existing changelog
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2007 20:10:46 -0500] rev 4269
appendfile: handle only changelog.i file
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2007 19:54:15 -0500] rev 4268
appendfile: remove unused manifest code
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2007 19:52:38 -0500] rev 4267
revlog: simplify revlog version handling
- pass the default version as an attribute on the opener
- eliminate config option mess
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2007 19:12:03 -0500] rev 4266
revlog: don't pass datafile as an argument
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 23 Mar 2007 23:40:25 -0300] rev 4265
use os.path.islink instead of util.is_link; remove util.is_link
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 23 Mar 2007 23:40:24 -0300] rev 4264
Add some tests for symlink tracking
Eric St-Jean <esj@wwd.ca> [Wed, 21 Mar 2007 23:20:56 -0400] rev 4263
Fix localrepo.copy to deal with symbolic links.
Eric St-Jean <esj@wwd.ca> [Wed, 21 Mar 2007 23:20:56 -0400] rev 4262
Backup symbolic links when reverting
Eric St-Jean <esj@wwd.ca> [Wed, 21 Mar 2007 23:20:56 -0400] rev 4261
fix util.copyfile to deal with symlinks
Brendan Cully <brendan@kublai.com> [Fri, 23 Mar 2007 14:11:31 -0700] rev 4260
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com> [Wed, 21 Mar 2007 14:06:25 -0700] rev 4259
Make import opportunistically use merge information
Brendan Cully <brendan@kublai.com> [Thu, 22 Mar 2007 10:44:59 -0700] rev 4258
Add import --exact.
When this option is set, import will apply the patch (which must
be generated by export) to the parents specified in the patch,
and check that the node produced by the patch matches the node
ID in the patch.
Brendan Cully <brendan@kublai.com> [Thu, 22 Mar 2007 10:40:28 -0700] rev 4257
Add --outgoing option to patchbomb
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 20 Mar 2007 22:21:05 -0300] rev 4256
Merge additional fixes for my matcher changes
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 20 Mar 2007 22:09:55 -0300] rev 4255
glob:<directory> patterns match the files in that directory.
This makes the behaviour of glob: patterns more consistent:
hg status glob:dir and hg status -I glob:dir will match
the same files.
It's also consistent with the fact that {rel,}path patterns
recursively match the contents of a directory.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 20 Mar 2007 22:09:53 -0300] rev 4254
Pass normalized directory names to the ignore function
This fixes a bad performance regression caused by dd0d9bd91e0a.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sun, 18 Mar 2007 22:49:05 +0200] rev 4253
tests: expand test-commit a bit to test 'hg commit .' too
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.