Commit Graph

4321 Commits

Author SHA1 Message Date
Alexis S. L. Carvalho
ea51c7fac2 Merge with crew-stable. 2007-04-09 04:57:25 -03: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
Alexis S. L. Carvalho
047c4b002b Merge with crew-stable. 2007-04-07 04:45:27 -03:00
Brendan Cully
b2c127323e Merge with Matt 2007-04-05 15:20:42 -07:00
Matt Mackall
808f098616 Merge with stable 2007-04-05 17:09:31 -05:00
Brendan Cully
49e8f31f9f Merge with Matt 2007-04-05 14:55:27 -07:00
Matt Mackall
ebc2b5ccc8 merge: fix a bug where copies were ignored 2007-04-05 16:43:18 -05:00
Matt Mackall
1e8fed06d8 merge: fix a bug where copies were getting ignored 2007-04-05 16:25:47 -05:00
Matt Mackall
746c62bff7 Fixups for recent changes in revlog version handling 2007-04-02 14:16:44 -05: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
Alexis S. L. Carvalho
d6886d1abf hgweb: don't display heads in gitweb-style summary page 2007-03-27 01:41:25 -03: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
greg@maptuit.com
889f908913 hgweb: display named branches in gitweb-style summary page 2007-03-16 17:55:42 -04:00
Alexis S. L. Carvalho
33d6c26f90 test-ssh-clone-r: avoid a shell script 2007-03-27 01:41:23 -03:00
Alexis S. L. Carvalho
ba3bf8a6ef test-ssh: avoid a shell script 2007-03-27 01:41:22 -03:00
Alexis S. L. Carvalho
a0b1283443 test-init: avoid a shell script 2007-03-27 01:41:21 -03:00
Alexis S. L. Carvalho
2e32993a6a test-rename-merge2: avoid a shell script 2007-03-27 01:41:20 -03:00
Alexis S. L. Carvalho
91aeb4643e test-merge6: avoid a shell script 2007-03-27 01:41:18 -03:00
Alexis S. L. Carvalho
03fea0246c test-merge1: avoid a shell script 2007-03-27 01:41:17 -03:00
Alexis S. L. Carvalho
e16d5f9b1a test-filebranch: avoid a shell script 2007-03-27 01:41:16 -03: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