Patrick Mezard
c06d45d1c7
mq: test qtop with holes in the patch sequence.
2007-04-12 22:41:50 +02:00
TK Soh
424b1a050d
minor typo fix in templater's docstring
2007-04-10 12:24:28 -05:00
Patrick Mezard
5c6309243f
Add test for issue 529 - "mq aborts when merging patch deleting files".
2007-04-07 19:42:26 +01:00
Alexis S. L. Carvalho
5907b48b37
mq: don't abort when merging a patch that removes files
2007-04-09 04:24:17 -03:00
Alexis S. L. Carvalho
c250e89b1e
atomicfile: don't copy the original file if it'll be truncated
2007-04-09 04:24:17 -03:00
Alexis S. L. Carvalho
9497591b05
use atomictemp files to write the dirstate
2007-04-09 04:24:17 -03:00
Alexis S. L. Carvalho
9c723b4f96
use atomictemp files to write branch.cache
2007-04-09 04:24:17 -03:00
Alexis S. L. Carvalho
c9f461c7af
util.opener: if requested, use atomicfile even if the file doesn't exist
...
Right now, surprisingly enough, if you request an atomic file but the
file still doesn't exist, you get a regular file. AFAICS, the only time
this happens is during the initial creation of the dirstate.
2007-04-09 04:24:17 -03:00
Alexis S. L. Carvalho
cbe674cc00
cache os.umask even on windows
2007-04-09 04:24:17 -03:00
Matt Mackall
9d8e9305e4
pull umask-checking up
2006-12-29 20:04:30 -06:00
TK Soh
8a4ed5c177
help: log --keyword is case-insensitive
2007-03-29 10:25:19 -05:00
TK Soh
bdd80aea95
hgweb: expand keyword search to full list of files
2007-03-29 09:32:59 -05:00
TK Soh
9f11c60f21
log: expand keyword search to full list of files
2007-03-29 09:28:10 -05:00
Alexis S. L. Carvalho
31232bf5ab
run-tests.py: use coverage.py with "#!/usr/bin/env python" tests
2007-04-07 04:27:55 -03:00
Alexis S. L. Carvalho
63574c7e40
run-tests.py: small cleanup
2007-04-07 04:27:55 -03:00
Alexis S. L. Carvalho
5dd065da79
run-tests.py: use coverage.py with *.py tests
2007-04-07 04:27:55 -03:00
Alexis S. L. Carvalho
77c152a933
run-tests.py: tell coverage.py to ignore errors
...
Otherwise there'll be some IOErrors when it tries to open python
files created during the execution of e.g. test-hook.
2007-04-07 04:27:55 -03:00
Alexis S. L. Carvalho
766df29f00
test-bad-pull: try to avoid timing-related failures
2007-04-07 04:27:55 -03:00
Alexis S. L. Carvalho
0489c59b5e
Try to find diffstat in PATH before calling it
...
At least on Solaris, /bin/sh will print a "command not found" message
even if we redirect stderr.
2007-04-07 04:27:55 -03:00
Alexis S. L. Carvalho
8e9491052e
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
...
This should make it easier to discover global options.
As a bonus, they are no longer displayed by something like a
hg -v help dates
2007-04-07 04:27:55 -03:00
Alexis S. L. Carvalho
b98b34fc2e
revlog.py: fix/tweak read ahead code in lazyparser
2007-04-07 04:27:55 -03:00
Matt Mackall
ebc2b5ccc8
merge: fix a bug where copies were ignored
2007-04-05 16:43:18 -05:00
Matt Mackall
84a6ecd211
tags: require -f to replace an existing tag
...
based on a patch from Johan Herland <johherla@online.no>
2007-03-23 00:12:28 -05:00
Matt Mackall
6d86b7e7d9
tags: fix abababa case, with test case
2007-03-22 23:52:50 -05:00
Alexis S. L. Carvalho
1ff95ba799
debugsetparents: wlock the repo before updating the dirstate
2007-03-19 19:07:40 -03:00
Alexis S. L. Carvalho
3082154fa5
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.
2007-03-19 19:07:39 -03:00
Alexis S. L. Carvalho
b2ef464fc4
avoid wsgiapplication <-> MercurialHTTPServer circular reference
2007-03-19 19:07:38 -03:00
Alexis S. L. Carvalho
69ecc6b336
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.
2007-03-19 19:07:37 -03:00
Alexis S. L. Carvalho
8bb9d231ee
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.
2007-03-19 19:07:35 -03:00
Thomas Arendsen Hein
a6c18d39af
Fixed synopsis for some mq commands
2007-03-18 20:39:25 +01:00
Thomas Arendsen Hein
1bd533bfe0
hg qseries -m: guards file was not ignored
2007-03-18 20:37:47 +01:00
Thomas Arendsen Hein
b05341e0d2
Tests for qapplied/qunapplied fixes (10a3604dafc6 and 394fae2055db)
2007-03-18 19:41:28 +01:00
Thomas Arendsen Hein
3c65cfc2d4
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
2007-03-18 12:20:15 +01:00
Thomas Arendsen Hein
6e23ab4e60
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.
2007-03-17 18:46:52 +01:00
Alexis S. L. Carvalho
beebce1bec
avoid a traceback with hg branch newbranch; hg up
2007-03-16 00:22:59 -03:00
Alexis S. L. Carvalho
e488c0e84f
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.
2007-03-16 00:22:58 -03:00
Alexis S. L. Carvalho
fcb39243b1
pass repo.root to util.pathto() in preparation for the next patch
2007-03-16 00:22:57 -03:00
Alexis S. L. Carvalho
2b2a1a8a86
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".
2007-03-16 00:22:55 -03:00
Alexis S. L. Carvalho
8d63449217
hgweb.unbundle: call req.httphdr only after the last possible call to bail
2006-10-22 13:54:43 -03:00
Alexis S. L. Carvalho
b1e6fe8df6
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.
2007-03-16 00:22:53 -03:00
Alexis S. L. Carvalho
459844ad17
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 53588684b6e6
forgetting sub1/file1
2007-03-16 00:22:52 -03:00
Matt Mackall
e07d848162
Merge with crew
2007-03-15 18:55:53 -05:00
Matt Mackall
e33842c05f
revlog: attempt to gracefully handle some interleaved damage
2007-03-15 18:38:46 -05:00
Thomas Arendsen Hein
87850b6a0e
Merge with hg-stable
2007-03-15 09:49:45 +01:00
Matt Mackall
d6ce65f557
tags: add --remove
2007-03-14 19:13:04 -05:00
Matt Mackall
ba891a21b8
tags: remove unused variables
2007-03-14 18:49:10 -05:00
Matt Mackall
6788bba79c
Make the tags algorithm smarter
2007-03-14 18:47:29 -05:00
Matt Mackall
bc68a5f878
Refactor tags code to prepare for improving the algorithm
2007-03-14 16:40:47 -05:00
Thomas Arendsen Hein
678e517eae
Only hg repositories override [paths], not simple directories (fixes issue510)
2007-03-14 22:38:40 +01:00
Matt Mackall
c1ade819b5
Remove dummy branch hack from tests
2007-03-13 18:53:23 -05:00
