Commit Graph

1310 Commits

Author SHA1 Message Date
Bryan O'Sullivan
044477626b Merge with mpm 2007-12-19 19:23:18 -08:00
Bryan O'Sullivan
0ce5bba724 Merge with crew 2007-12-19 19:21:30 -08:00
Jesse Glick
e75d3a3d78 Issue 882: add standard hook to reject text files with CRLF.
While the win32text extension does LF <-> CRLF conversion, and will issue a
warning in case a file already in the repository uses CRLF, it provides no
mechanism for verifying that incoming changes use LF. In a large development
team with some Windows users, it is virtually guaranteed that someone will
forget to set up the encode filter correctly and accidentally check in a file
using CRLF, which can cause warnings for other Windows users when they next
fetch changes. Since this is a general problem it is desirable to have a
pre-commit (or -push) hook available to reject such accidents earlier rather
than trying to fix them up after the fact.
2007-12-19 17:02:31 -05:00
peter.arrenbrecht@gmail.com
86c52a7365 mq: add --currentuser and --user options to qnew and qrefresh
These options make qnew and qrefresh add/update the "From:" header (or, if present,
the "# User" header). This allows proper attribution of patches in patch queues
with multiple contributors.
2007-12-19 22:36:18 +01:00
Peter Arrenbrecht
18fb9f5e5e Fix income/pull with bundle and -R (issue 820).
Uses ui.setconfig() to tell bundlerepo where the main repo is. This is
needed for when the --repository option is used.

Adds tests to test-bundle and a new test script
test-mq-pull-from-bundle, which plays out the situation that initially
made me detect this bug

(hg -R .hg/patches pull ../bundle.hg).
2007-12-18 14:11:13 -06:00
Patrick Mezard
1fb759fad1 patch: write rej files for missing targets (issue 853) 2007-12-17 23:42:46 +01:00
Patrick Mezard
c43b58242b patch: move diff parsing in iterhunks generator 2007-12-17 23:06:01 +01:00
Matt Mackall
fda4cb5390 Merge with crew 2007-12-07 14:59:33 -06:00
Matt Mackall
06d5fbf2a5 copy: handle rename internally
- add rename parameter
- don't collect copied list
- report "moving" rather than "copying"
- remove renamed files
- don't return copied list
- simplify callers
2007-12-07 02:29:55 -06:00
Matt Mackall
e777df13c0 copy: simplify inner copy
- save dirstate lookup and exists check
- do all fs work inside a single dryrun clause
- move unlinking into inner copy section
- move target dir creation
- eliminate undelete mess
- fix a bug on mv a -> b -> a after merge
2007-12-07 02:01:13 -06:00
Dirkjan Ochtman
5cda3f99f4 hgwebdir: split out makeindex function, facilitate test failure diagnosis 2007-12-03 18:40:37 +01:00
Bryan O'Sullivan
f504f42466 coverage: return to not assuming that python is in /usr/bin 2007-12-02 21:54:56 -08:00
Bryan O'Sullivan
96070392c5 Fix breaking test from aa641bdbd843 2007-12-02 21:52:40 -08:00
Matt Mackall
7d8a71a539 churn: avoid division by zero 2007-12-02 17:04:16 -06:00
Matt Mackall
1d88526edb update test output 2007-12-02 16:26:56 -06:00
Dirkjan Ochtman
fa26469f51 import latest coverage.py version 2007-12-02 23:26:40 +01:00
Dirkjan Ochtman
f0a64b1743 add more tests for hgweb commands 2007-12-02 23:26:40 +01:00
Matt Mackall
2e547ddf4b doc: add repo/ to .hgignore and .hgtags
These names were disappearing in the asciidoc output and no form of
escaping seems to help. Let's just add repo/ to make it explicit that
they're in the repository root.
2007-12-02 15:52:36 -06:00
Patrick Mezard
30d1cd81b7 hgwebdir: test virtual paths leading or trailing separators are stripped 2007-12-02 19:39:29 +01:00
Patrick Mezard
e7dc152912 Merge with crew-stable 2007-12-02 14:06:10 +01:00
Patrick Mezard
4bd17cf5de mq: missing target files do not make qpush to fail immediately (issue 835)
Reported and explained by Peter Arrenbrecht <peter.arrenbrecht@gmail.com>.
Following file additions were skipped but empty files were still created. This situation could lead to qrefresh losing patch information.
2007-12-02 13:53:29 +01:00
Dirkjan Ochtman
857b34f4d7 Fix style nit and add some comments to tests. 2007-12-02 10:12:26 +01:00
Dirkjan Ochtman
a20c52b449 Use SCRIPT_NAME and PATH_INFO instead of REQUEST_URI. This is required by WSGI (fixes issue846). 2007-12-01 19:19:08 +01:00
Dirkjan Ochtman
2aa00c9c81 Add tests for hgwebdir repository names with slashes in them. 2007-12-01 19:10:00 +01:00
Dirkjan Ochtman
9851dc942e CGI compatibility fix for 77bd163fb48d. 2007-12-01 18:26:27 +01:00
Dirkjan Ochtman
eb63af80e4 Less indirection in the WSGI web interface. This simplifies some code, and makes it more compliant with WSGI. 2007-11-30 18:23:18 +01:00
Bryan O'Sullivan
43a520697c hgweb: account for Python 2.4 in one test 2007-11-28 11:54:39 -06:00
Bryan O'Sullivan
e19dabc11f hgweb: return meaningful HTTP status codes instead of nonsense 2007-11-28 08:38:42 -08:00
Bryan O'Sullivan
314630c85c convert: some tidyups, doc improvements, and test fixes
The various back end options are now documented.
The hg source can now be configured not to hand out a revision ID.
2007-11-27 09:44:09 -08:00
Bryan O'Sullivan
a364fef5fb Merge with crew 2007-11-26 17:24:21 -08:00
Bryan O'Sullivan
eff109c7b0 convert: tell the source repository when a rev has been converted
This lets us roundtrip changes between svn and hg.
2007-11-26 17:23:20 -08:00
Patrick Mezard
eeff34ef5f Merge with crew-stable 2007-11-25 12:42:06 +01:00
Patrick Mezard
f280a41d83 test-import: test fuzziness, ambiguous patch locations 2007-11-25 12:17:30 +01:00
Patrick Mezard
cbf322b12c cmdutil: make "files" list all files, add "file_mods" for modified files 2007-11-24 20:16:59 +01:00
Patrick Mezard
8f3f01adea cmdutil: always expose "files_add", "files_del" and "manifest" templater properties 2007-11-24 17:56:15 +01:00
Patrick Mezard
80735bf58c Merge with crew-stable 2007-11-20 14:41:47 +01:00
Patrick Mezard
8ae803be30 mq: avoid qnew committing everything on invalid paths (issue 803)
If paths are supplied but resolve to nothing, localrepo.commit() is called with an empty set and commits the whole dirstate. Avoid this by passing the match function to commit.
2007-11-20 14:31:58 +01:00
Patrick Mezard
808b254fe1 test-convert-svn-sink: test directory additions 2007-11-17 18:41:31 +01:00
Patrick Mezard
c182383712 test-import: read email payload in binary mode 2007-11-10 21:30:43 +01:00
Alexis S. L. Carvalho
2e160ca8ff merge with crew-stable 2007-11-09 21:24:25 -02:00
Alexis S. L. Carvalho
0086f97dc7 mq: really remove undo after a qpush (and after a strip)
For qpush, removeundo has to be called after the transaction has finished.

strip may use unbundle, which also leaves an undo file.

Fixes issue780.
2007-11-09 20:21:35 -02:00
Matt Mackall
d3de4f56b7 Merge with crew 2007-11-07 21:13:56 -06:00
Bryan O'Sullivan
68c398d741 convert: add support for Subversion as a sink 2007-11-07 18:26:59 -08:00
Matt Mackall
10b354f4a5 Mark failing test as a known bug 2007-11-07 14:38:04 -06:00
Bryan O'Sullivan
33c2bc9eb9 Merge with -stable 2007-11-05 13:20:24 -08:00
Manuel Holtgrewe
4a33cb8d98 Do not display passwords with pull/push/incoming/outgoing
Passwords specified in the repository URL are now displayed as '***'
when accessing the remote repository.
2007-11-05 20:29:32 +01:00
Alexis S. L. Carvalho
9877d9e85e run-tests.py: add a default --date "0 0" argument to commit et al
Part of test-tags was modified just to be sure this works.

The change in test-archive-symlinks is necessary to avoid a "helpful"
warning from GNU tar ("implausibly old time stamp 1970-01-01 00:00:00").
2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
cde5fb5024 tests/*: avoid losing the original settings from $HGRCPATH 2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
959d3f5cd4 test-convert-darcs: skip if we can't find the elementtree module
This patch is a bit dirty to avoid having to repeat the dance required
to import elementtree.
2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
bb984a6137 test-permissions: add a chmod +w to allow the directory to be removed 2007-11-09 20:21:35 -02:00