facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity
6,678 Commits 24 Branches 62 Tags 324 MiB
a74c0e9f94
Commit Graph

1700 Commits

Author SHA1 Message Date
Will Maier
213ea70ab4 Don't use the -i option with sed 
This patch fixes test-keyword on platforms without GNU sed (like
OpenBSD).
 2008-01-09 10:00:18 -06:00
Jesse Glick
500b64344a Issue #880: Simple misspelling ('occured') in web error message. 2008-01-05 15:35:46 -05:00
Michele Cella
0e20a92c0f adding "prefix" option to "hg serve" (command line and [web] section) 
allows "hg serve" to serve from a different path than '/' (server root)
 2008-01-09 11:15:00 +01:00
Maxim Dounin
690088d7ef test-mq-header: don't fail with different patch(1) 
At least under FreeBSD patch(1) won't fail on empty patch and will print
'Hmm...' warning instead. Sanitize output so tests won't fail unexpectedly.
 2008-01-08 06:56:21 +03:00
Matt Mackall
e834530a71 Fix up tests for XHTML validation bits 2008-01-08 15:56:12 -06:00
Christian Ebert
459ae2dd85 keyword: add test 2008-01-04 18:22:39 +01:00
Alexandre Vassalotti
60c2f6f43d restore branch after rollback (issue 902) 2008-01-07 15:26:12 -06:00
Maxim Dounin
4d9877b4eb Fix copies reporting in log and convert. 
If copy logged in file revision, we report copy for changeset only
if file revisions linkrev points back to the changeset in question
or both changeset parents contain different file revisions.

This fixes extra copies reported when executable bit was changed for
previously copied file.
 2007-12-29 17:11:48 +03:00
Maxim Dounin
940a0afd31 context: preserve changeset in filectx if we have one 
If we know original changeset we are working with - try hard to
preserve it. Fallback to filelog.linkrev() only if we have no way
to get original changeset, since linkrev() may point to other
changeset.
 2007-12-29 16:57:43 +03:00
Patrick Mezard
d6fbb24257 test-convert-hg-svn: make it more windows friendly 2008-01-05 17:36:16 +01:00
Patrick Mezard
7bfa89c3df test-convert-svn-sink: wrap repetitive svn checks in a function 2008-01-05 17:36:16 +01:00
Patrick Mezard
336268093f Merge with crew-stable 2008-01-05 22:52:28 +01:00
Patrick Mezard
4200777a7b test-convert: test before() and after() conversion actions 2008-01-04 23:43:55 +01:00
Patrick Mezard
afdb5ad6e2 test-convert-svn-source: test convert/multiple extra fields 2008-01-04 23:43:55 +01:00
Bryan O'Sullivan
497bf2ca7a fetch: hide authentication details 2008-01-04 11:58:27 -08:00
Peter Arrenbrecht
30621bccda mq: add --currentdate and --date options to qnew and qrefresh 
These options make qnew add and qrefresh update a "# Date "-style
header line. This allows proper recording of creation / last
modification dates of patches in patch queues.

Note that `qrefresh -D` only updates existing header lines. It never
adds them, and does not warn about this. This is because I expect
people to have `[default] qrefresh -D` in their .hgrc so patches with
tracked dates get updated, others are left unchanged. The suggested
setup in .hgrc is, in fact,

  [default]
  qnew = -D -U
  qrefresh = -D

I tried to not mix header styles, so `qnew -D -U` now writes the user in
"# User "-style, while `qnew -U` still writes it "From: "-style. Also, if
`qrefresh -U` must add the user, it does so in "# User "-style if the
header contains a "# HG changeset patch" line. (This is caused by mq
not supporting the "Date: "-style header line at all - a reasonable choice
given its standard date format.)
 2008-01-02 16:24:13 +01:00
Kevin Christen
1b023c6158 Fixed XHTML validation errors 2008-01-03 13:39:26 -06:00
Thomas Arendsen Hein
35cbed7baa Move aliases section in help below synopsis (issue362) 
This should avoid confusion why e.g. "hg help co" shows help
for "hg update" instead.
 2008-01-02 20:22:10 +01:00
Patrick Mezard
2c5d3eddb4 test-convert-svn-source: test stop revision 2008-01-01 23:12:48 +01:00
Thomas Arendsen Hein
fdf4576462 Obfuscate (instead of just escape) contact/owner in gitweb summary. 
This could contain an email address.
 2008-01-01 17:12:37 +01:00
Thomas Arendsen Hein
1566cda979 Don't let ui.username override web.contact (issue900) 
63beab327d26 introduced using ui.username before web.contact, but this was
never documented and might cause commit accidents.

- Drop web.author (deprecated since 2005)
- Try ui.username or $EMAIL as a fallback to display something useful.
- Update docs for the fallbacks.
 2008-01-01 17:07:15 +01:00
Matt Mackall
6b6b2e0e73 bisect: improve tests 
- test skipping
- test noupdate
- test bad->good search
- test inconsistent state
 2007-12-31 18:20:34 -06:00
Matt Mackall
917f5ce70a bisect: handle search for bad to good transitions 
Automatically detect whether we're looking for a bad to good
transition rather than the usual good to bad transition by detecting
when badrev is inside the good set and flipping good/bad.
 2007-12-31 18:20:34 -06:00
Matt Mackall
bee8b54b36 bisect: make bisect a built-in command 2007-12-31 18:20:34 -06:00
Matt Mackall
ecc644d5d1 Merge backout 2007-12-31 18:20:25 -06:00
Matt Mackall
62cb860a38 Backed out changeset f019d9201ff4 
Unfortunately, this breaks backward compatibility.
 2007-12-31 17:47:02 -06:00
Thomas Arendsen Hein
fd0ebb6a0c Show number of changesets written to bundle files by default (issue569) 
This was only shown with -v before.
 2007-12-30 19:46:13 +01:00
Thomas Arendsen Hein
2be743c9ed "C" status code considered harmful, so changed to "=" (issue899) 
C means conflict in other SCMs, and = is more intuitive anyway.
 2007-12-30 17:45:26 +01:00
Thomas Arendsen Hein
087cac8a21 Adjust changed test output after 24f7cb0e6b71 (trailing whitespace) 2007-12-30 17:36:49 +01:00
Thomas Arendsen Hein
347da85c36 Removed tabs and trailing whitespace in python files 2007-12-29 19:49:48 +01:00
Thomas Arendsen Hein
d63fbb0105 merge with crew 2007-12-28 17:10:57 +01:00
Thomas Arendsen Hein
8dbd54d63d Clarify some messages during commit: 
- use "branch 'foo'" to distinguish from "branch merge".
- commit messags can be empty (to abort commits)
- Added value for editor message: Tell about HG: lines like CVS does.
 2007-12-28 17:10:25 +01:00
Patrick Mezard
f7a359686e Merge with crew-stable 2007-12-28 16:46:44 +01:00
Thomas Arendsen Hein
f1499b31ef merge with crew 2007-12-28 16:32:14 +01:00
Patrick Mezard
d9be0f3383 Prompt for a commit message in editor, improve error message 2007-12-28 14:51:16 +01:00
Patrick Mezard
d404bfca4f test-convert-cvs: force cvs -f options to avoid cvsrc 
There are some reference to a CVS_OPTIONS environment variable doing that but
it does not work on my system (cvs 1.11.20, macosx).
 2007-12-27 19:23:22 +01:00
Maxim Dounin
54de122616 convert: svn-sink: copy and set properties after adding dirs/files 
We can't store properties for files we haven't added to repo. Similarly,
we can't copy file to directory we haven't added to svn yet. Remember
needed changes and apply them in putcommit().
 2007-12-27 03:14:46 +03:00
Maxim Dounin
a8a4715876 convert: don't read ~/.cvsrc in test-convert-cvs 2007-12-27 19:59:44 +03:00
Thomas Arendsen Hein
d02cbcaa88 merge with crew-stable 2007-12-27 13:39:59 +01:00
Thomas Arendsen Hein
3cd6fe199f merge with crew-stable 2007-12-26 23:03:32 +01:00
Mirko Friedenhagen
2a87bfec34 server: append to logfiles 2007-12-24 17:21:40 +01:00
Patrick Mezard
2c06488c05 Move diffing missing file test and remove test-notfound 
No point to have a test dedicated to this diff behaviour.
 2007-12-24 12:22:33 +01:00
Patrick Mezard
fd1268357e commands: add exits(1) if a specified file cannot be added (issue 891) 2007-12-24 12:14:43 +01:00
Patrick Mezard
7af6ee2ffb test-hgweb-commands: replace all "XX years ago" occurences 2007-12-24 01:50:07 +01:00
Lee Cantey
8c88af89e3 Switch to using cat with EOF doc instead of trying to quote newlines for echo. 2007-12-21 14:26:20 -08:00
Thomas Arendsen Hein
cb74375be7 Use skipped: instead of hghave: for skipping tests, use this in test-merge-types 2007-12-21 21:50:19 +01:00
Thomas Arendsen Hein
4a19a0186d merge with crew-stable 2007-12-21 12:14:35 +01:00
Thomas Arendsen Hein
3aa5d6c16c Use common readlink.py instead of own implementations per test script. 2007-12-21 10:24:03 +01:00
Thomas Arendsen Hein
becde51102 Use test -h instead of test -L for portability 
Citing from the GNU autoconf manual:
"either form conforms to Posix 1003.1-2001, but older shells like Solaris 8
 /bin/sh support only -h"
 2007-12-21 09:51:19 +01:00
Patrick Mezard
b349162295 test-hgweb: fix css update 2007-12-21 00:14:45 +01:00
Patrick Mezard
d1b62d9bf5 test-win32text: avoid unix2dos, printf extensions 2007-12-21 00:13:00 +01:00
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
John Coomes
5c790a2f5f hg tag: run tag hook just once 2007-12-18 12:45:30 -08:00
Matt Mackall
3d2020e6ca add debugfsinfo to check fs capabilities 2007-12-27 23:55:40 -06:00
Matt Mackall
98edd8fe9d bisect: use more standard command syntax and help 2007-12-27 23:55:40 -06:00
Matt Mackall
5fef1977f2 update test-merge-types 2007-12-27 23:55:36 -06:00
Matt Mackall
49c18f282e wwrite: simplify with util.set_flags 
- always attempt to delete the file (gets rid of read-only message)
- always write as a normal file
- use set_flags to convert to link or set exec
 2007-12-27 22:27:47 -06:00
Matt Mackall
2af988f28f add --debug to test-merge-types 2007-12-27 22:27:43 -06: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
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
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
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
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
Peter Arrenbrecht
cf89ef2576 Add output markers to test-bundle so it's easier to spot the source of 
output diffs.
 2007-11-03 11:11:13 +01:00
Osku Salerma
e2010f2b5b Add --verbose support to tags command. 2007-12-09 17:14:38 +09:00
Osku Salerma
cb7de57ab7 Properly check tag's existence as a local/global tag when removing it. 2007-12-09 16:32:05 +09:00
Bryan O'Sullivan
6605c95531 Test a merge of a symlink against an executable file. 
This should result in a conflict, but the symlink always wins.
 2007-11-02 14:02:28 -07:00
Bryan O'Sullivan
e08db629ad Merge with crew-stable. 2007-11-01 15:22:10 -07:00
Patrick Mezard
7df367eed1 test-execute-bit: skip if execute-bit is not supported 2007-10-27 20:23:46 +02:00
Bryan O'Sullivan
209f13bbaf See if execute bit is honoured when we go back in time 2007-10-26 16:43:13 -07:00
Matt Mackall
4412e65957 backout: disallow across branches (issue655) 2007-12-01 13:09:27 -06:00
Matt Mackall
3c8b7b8583 rename: add test for moving untracked files in directories 2007-12-01 12:54:34 -06:00
jorendorff@mozilla.com
c3848517a7 commands.py, patch.py: add -U option to hg diff command 2007-07-26 07:56:04 -04:00
Matt Mackall
3dfe783ec5 transactions: avoid late tear-down (issue641) 
We use weak references (ugh) to avoid having to manually delete
transaction references out of each call frame when an exception occurs.
 2007-07-22 14:53:57 -05:00
Thomas Arendsen Hein
b35814d4c2 merge with crew-stable 2007-07-22 09:45:18 +02:00
Bryan O'Sullivan
a09e8936ae addremove: print meaningful error message if --similar not numeric 2007-07-21 19:07:18 -07:00
Matt Mackall
cd72dc7f1b Merge with crew 2007-07-21 16:44:38 -05:00
Matt Mackall
3fdaa5a42e Use a weakref for recursive transactions 2007-07-21 16:02:10 -05:00
Alexis S. L. Carvalho
e0b6efcdbf help: avoid traceback if an extension has only debug commands 2007-07-19 19:43:25 -03:00
Alexis S. L. Carvalho
a8e3b41c40 merge with crew-stable 2007-07-19 19:48:24 -03:00
Thomas Arendsen Hein
0fccb9b2ae merge with crew-stable 2007-07-18 16:46:01 +02:00
Thomas Arendsen Hein
085838b3dc fix test-tag on Solaris 2007-07-18 16:41:45 +02:00
Bryan O'Sullivan
bbc8c72100 Update test output to reflect small changes in patch chattiness. 2007-07-17 09:39:30 -07:00
Alexis S. L. Carvalho
ae58d97874 merge with crew-stable 2007-07-17 09:28:01 -03:00
Alexis S. L. Carvalho
4770c831b2 hg parents: don't pass an OS-specific path to repo.filectx 
The only reason to use the matcher code instead of calling util.canonpath
directly is to be able to use "path:canonical/path/to/file" patterns.
 2007-07-17 09:08:29 -03:00
Bryan O'Sullivan
c824069322 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) 
This also fixes an asymmetry bug in which we called the pretag hook if we
were going to create a local tag, but didn't call the tag hook afterwards.
 2007-07-16 20:15:03 -07:00
Bryan O'Sullivan
39c3672fd0 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) 
This also fixes an asymmetry bug in which we called the pretag hook if we
were going to create a local tag, but didn't call the tag hook afterwards.
 2007-07-16 20:15:03 -07:00
Bryan O'Sullivan
e2e04c39f7 issue 622: pull/unbundle -u updates to default branch if repo was empty 2007-07-16 18:01:20 -07:00
Bryan O'Sullivan
ef448328f7 issue 622: pull/unbundle -u updates to default branch if repo was empty 2007-07-16 18:01:20 -07:00
Bryan O'Sullivan
e1c7de520a mq: autodetect an existing git patch during qrefresh (issue 491) 2007-07-16 16:50:47 -07:00
Bryan O'Sullivan
3ab73cd145 mq: autodetect an existing git patch during qrefresh (issue 491) 2007-07-16 16:50:47 -07:00
Patrick Mezard
afa316b160 Merge with crew-stable. 2007-07-15 14:57:20 +02:00
Patrick Mezard
9ce0928703 test-symlink-basic: require symlinks availability 2007-07-15 14:09:56 +02:00
Matt Mackall
86ab3ea033 Merge with -stable 2007-07-14 13:34:40 -05:00
Matt Mackall
6a7cb8cbaa diff: correctly handle combinations of whitespace options 2007-07-14 12:44:47 -05:00
Patrick Mezard
a17aa86e69 Add hghave utility and run-tests.py support. 
hghave detects system features like symlinks availability at run-time. Tests can be skipped by starting them with:

"$TESTDIR/hghave" symlink || exit 80

The 80 exit status triggers hghave output handling by run-tests.py. Also, tests output can be locally patched on the fly to match reference output.
 2007-07-14 18:34:06 +02:00
Patrick Mezard
4e0f588756 run-tests: extract correct status when script terminates with exit 2007-07-14 14:01:11 +02:00
Giorgos Keramidas
827573f6ad hg grep: handle re.compile errors & update tests/test-grep 2007-07-09 17:41:14 +03:00
Alexis S. L. Carvalho
e4f786c463 archive: make the %r escape work. 2007-07-11 19:56:16 -03:00
Alexis S. L. Carvalho
3b07689b6a serve: respect settings from .hg/hgrc 
create_server was looking only at the root ui object, ignoring any
settings from .hg/hgrc.  To keep respecting command-line arguments,
commands.serve must also call repo.ui.setconfig.
 2007-07-11 19:56:16 -03:00
Christian Ebert
7a47878736 Use isinstance instead of type == type 2007-07-06 12:02:43 +02:00
Alexis S. L. Carvalho
05dd580e30 merge with crew-stable 2007-07-11 20:15:03 -03:00
Brendan Cully
5421e55633 archive: abort on empty repository. Fixes #624. 2007-07-10 10:06:24 -07:00
Brendan Cully
98b8fae908 mq: improve qclone error handling when patch directory is not a repository. 2007-07-10 09:52:32 -07:00
Lee Cantey
04ba8da4cb Fix test-debugcomplete for new --certificate option 2007-07-09 22:35:10 -07:00
Thomas Arendsen Hein
5a9970a155 Add --line-number option to hg annotate (issue506) 
Line numbers are separated from the last annotation element with a colon,
like with many other commands, e.g. (hg) grep or compiler errors.

Idea and tests by FUJIWARA Katsunori.
 2007-07-08 19:59:02 +02:00
Thomas Arendsen Hein
a5d49326c9 merge with crew-stable 2007-07-08 12:59:58 +02:00
Thomas Arendsen Hein
898f48cc24 hg log: Move filtering implicit parents to own method and use it in templater. 
Extended test repo in test-command-template to contain changeset to test this.
 2007-07-08 12:52:08 +02:00
Matt Mackall
e3e7be0bf0 Merge with stable 2007-07-05 16:17:01 -05:00
Matt Mackall
aa6e63596e Merge with crew-stable 2007-07-05 16:15:57 -05:00
Matt Mackall
d00f8a1d6c merge: fix adding untracked files on directory rename (issue612) 
Fix from Brendan
Added test case
 2007-07-05 16:01:07 -05:00
Patrick Mezard
83721a8880 test-archive: stop checking md5 absolute values 
Different tar/zlib versions can generate different binaries.
 2007-07-05 20:39:03 +02:00
Matt Mackall
cfe7a0a522 merge: make test for fast-forward merge stricter (issue619) 
don't allow merging with an ancestor
fix != on contexts
add a test
 2007-07-05 13:34:18 -05:00
Alexis S. L. Carvalho
8c2c88e404 Make hg add foo; hg mv foo bar work. 
- foo will be removed (the user has a copy of its contents in bar)

- bar will not be marked as a copy (there was no committed version of foo).
  We print a warning telling that to the user.

Fixes issue269.
 2007-07-03 03:06:40 -03:00
Alexis S. L. Carvalho
a21d4fc96a test-copy2: use status -C instead of debugstate | grep copy 2007-07-03 03:06:40 -03:00
Alexis S. L. Carvalho
d69c63e916 test-rename: use hg status -C; don't use hg debugstate | grep copy 2007-07-03 03:06:40 -03:00
Brendan Cully
b1034db3e9 Handle extensions with defined but empty cmdtable 2007-06-28 21:16:25 -07:00
Brendan Cully
edeeaca988 mq: more qdelete help text tweaks 2007-06-28 09:19:08 -07:00
Brendan Cully
98fb3fa634 mq: require patch argument or revision for qdelete 2007-06-28 08:42:43 -07:00
Thomas Arendsen Hein
d17146e533 Make hg glog abort if unused arguments are given. 2007-06-28 16:18:09 +02:00
Thomas Arendsen Hein
4784c1900b Abort if earlygetopt fails to detect an option. 
Otherwise it could happen that a command is used on the wrong repository,
because abbreviations of --cwd or --repository were ignored.
 2007-06-28 16:03:45 +02:00
Matt Mackall
424fd43f0f Merge with stable 2007-07-05 15:36:56 -05:00
Patrick Mezard
1b80abfc56 Merge with crew-stable 2007-07-05 20:50:24 +02:00
Brendan Cully
0289847474 Add alias extension 2007-07-04 13:38:49 -07:00
Thomas Arendsen Hein
55ec898361 children extension: Don't abort when looking at the null revision. 
Since e3bc293c220b revlog.children only returns real children,
so this is no longer a problem.
 2007-07-03 12:50:05 +02:00
Thomas Arendsen Hein
c9b92d418a Add extension to provide the 'hg children' command (with tests) 2007-07-03 12:14:25 +02:00
Alexis S. L. Carvalho
f6cedde7e0 merge with crew-stable 2007-07-03 03:14:18 -03:00
Thomas Arendsen Hein
05a43d0fea Added import test for [PATCH] subject and message body with subject 2007-07-02 22:45:58 +02:00
Thomas Arendsen Hein
e10fcd1450 Disallow short earlygetop option combined with other short options 
While "hg commit -qRfoo" can be read as "--quiet --repository foo",
"hg commit -mRfoo" should be "--message Rfoo".
 2007-06-27 20:37:33 +02:00
Thomas Arendsen Hein
0b7147a667 Updated command tables in commands.py and hgext extensions. 
- Marked for translation where extensions already had _()
- Corrected indentation
- fixed a few synopsises
 2007-06-26 22:38:57 +02:00
Thomas Arendsen Hein
c6d47ef08c Catch illegal boolean values in hgrc nicely. 
With hg 0.9.3 the section and parameter name wasn't printed,
with hg 0.9.4 there was a traceback for ValueError.
 2007-06-26 20:37:15 +02:00
Thomas Arendsen Hein
b90da02eb3 Added test for earlygetopt fixes (8301dd2ee152 and fd08e85716bd) 2007-06-26 18:39:28 +02:00
Patrick Mezard
fa253700b6 test-demandimport: match upper-case hexadecimal 2007-07-05 19:11:38 +02:00
Thomas Arendsen Hein
5b3cfe2be9 Fix and test 'hg backout' without or with too many revisions. 2007-06-26 15:28:17 +02:00
Brendan Cully
23fe084573 mq: regularize patch header creation. 
Do not prefix qnew patches with [mq]: when a message has been given.
Always use [mq]: as the prefix for generated commit messages.
 2007-06-25 15:57:01 -07:00
Matt Mackall
469dca271e backout: report short hash in commit message 2007-06-25 12:44:48 -05:00
Giorgos Keramidas
5f8125a5a3 unbundle: accept multiple file arguments 
update test-bundle for multiple unbundle support
 2007-06-24 10:08:38 -05:00
Giorgos Keramidas
5a0956cb5a tests: add merge test for changeset 32f6be9c37df 
When all the files in a directory are moved somewhere else, and new
files are added in changesets of the local branch, a subsequent pull
and merge shouldn't rename the locally added files too.
 2007-06-23 22:43:46 -05:00
Emanuele Aina
5968bafc17 purge: don't delete ignored files if --all is not specified 2007-06-06 22:17:35 +02:00
Alexis S. L. Carvalho
cc6e60f60e merge: fix small bug with a failed merge across a rename 
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
 2007-06-22 20:44:40 -03:00
Alexis S. L. Carvalho
e85eaa593d git patches: correct handling of filenames with spaces 
Add a trailing TAB to the "--- filename" lines if there's a space
in the file name.  This allows patch(1) to work correctly.  The
same is done for diff --nodates.

This was originally suggested by Andrei Vermel, but at the time
I thought git was doing something different.
 2007-06-22 19:06:04 -03:00
Alexis S. L. Carvalho
64a37442ed dirstate.status: if a file is marked as copied, consider it modified 
After a "hg copy --force --after somefile cleanfile", cleanfile
shouldn't be considered clean anymore.
 2007-06-21 23:42:06 -03:00
Matt Mackall
265560b37a Merge with Eric Hopper 2007-06-21 18:05:14 -05:00
Matt Mackall
a38809cf9e merge: warn user about divergent renames 2007-06-21 18:02:03 -05:00
Eric Hopper
964ff0a5e3 Change branches to sort 'active' branches first, and add an option to show only active branches. 2007-06-21 10:40:09 -07:00
Matt Mackall
a0395f3952 identify: accept a revision argument 2007-06-21 11:54:11 -05:00
Matt Mackall
1f80f939a9 identify: show nullid for empty repo 2007-06-21 11:42:39 -05:00
Thomas Arendsen Hein
3019bb7a0b Kill trailing spaces 2007-06-21 09:25:49 +02:00
Alexis S. L. Carvalho
1d182cc78a mq: test that qpush cleans things up when it fails 2007-06-21 00:34:14 -03:00
Alexis S. L. Carvalho
2bdde5e379 update the output of test-help and test-globalopts 2007-06-21 00:34:14 -03:00
Brendan Cully
f7e826dad3 Fix dispatch error message when not in a repo 2007-06-20 20:13:31 -07:00
Brendan Cully
5e31fc3bf9 archive: test md5 consistency 2007-06-20 19:20:37 -07:00
Brendan Cully
e756af498f Test attempt to remove nonexistent tag 2007-06-20 18:09:40 -07:00
Brendan Cully
95c08c2bfc Small fixes for 3acdabb0ef1d (hg heads branch) 2007-06-20 17:53:11 -07:00
Eric Hopper
0bcc9fc15c Add option to heads to show only heads for current branch. 2007-06-19 08:37:43 -07:00
Patrick Mezard
6ef4333a38 Add tests for ui.patch regression. 2007-06-20 23:32:31 +02:00
Patrick Mezard
82fd511346 printenv: filter empty environment variables for portability. 2007-06-20 22:06:37 +02:00
Patrick Mezard
0b90ff3d83 Merge with crew-stable 2007-06-20 00:22:51 +02:00
Patrick Mezard
7607881784 test-annotate: add a test for issue 589. 2007-06-20 00:10:21 +02:00
Patrick Mezard
b6b2a3d29a Add test for debugrename 2007-06-20 00:09:32 +02:00
Thomas Arendsen Hein
3dcf92c53d Use printenv.py for pre/post-command-hooks (fixes tests on Solaris, too) 2007-06-19 08:17:55 +02:00
Thomas Arendsen Hein
483231d996 Cleanup of whitespace, indentation and line continuation. 2007-06-19 08:06:37 +02:00
Matt Mackall
ab72eb680f demandimport: fix issue579 and add a test 
fix suggested by Brendan
 2007-06-18 19:43:26 -05:00
Matt Mackall
c61bc27ccc dispatch: add generic pre- and post-command hooks 2007-06-18 17:49:56 -05:00
Brendan Cully
a4f4ecdc68 Merge with mpm 2007-06-18 12:39:43 -07:00
Brendan Cully
b969d388db Make fast-forward merges full merges 2007-06-18 12:38:54 -07:00
Matt Mackall
5ecb0cb232 dispatch: fix handling of incorrect number of arguments 2007-06-18 13:24:34 -05:00
Matt Mackall
579d9e3b44 encoding: pull fallbackencoding out of localrepo into early parsing 2007-06-18 13:24:34 -05:00
Brendan Cully
988e3fb1da Fix up tests for new branch message 2007-06-18 11:13:16 -07:00
Patrick Mezard
f2a33f2a1b Merge with crew-stable 2007-06-17 20:08:06 +02:00
Patrick Mezard
571e9d813f patchbomb: flush ui before delegating to pager. 2007-06-17 19:40:02 +02:00
Patrick Mezard
14cbb9abf5 test-patchbomb: fix non-existing --date parameter and filtering regexps. 2007-06-17 19:39:47 +02:00
Brendan Cully
3aa4171ea6 Merge with crew 2007-06-14 10:59:17 -07:00
Brendan Cully
228060290f Make parents with a file but not a revision use working directory revision. 2007-06-14 10:58:49 -07:00
Thomas Arendsen Hein
19530763e6 Reverted changesets a812fb9bfa26 and f1c9e4d4a477: show @ as glog parent again. 
Repainted the bikeshed with its original color.
 2007-06-14 12:54:06 +02:00
Alexis S. L. Carvalho
587c06ebc5 commands.commit: symlinks are supported 2007-06-13 19:15:58 -03:00
Brendan Cully
6b21b9d123 Merge with crew 2007-06-13 13:50:29 -07:00
Brendan Cully
e96607cf35 extensions: load modules in module/__init__.py form. 
For example, convert=/path/to/convert now works.
 2007-06-13 13:46:40 -07:00
Giorgos Keramidas
76dbb3042a test-patchbomb: sed -e may not work with extended regexps 
Non-GNU versions of the sed(1) utility (i.e. on Solaris or BSD)
may not support extended regexps (i.e. including \| branches),
or may need a special option to enable it (like -E instead of -e).

Expand the sed RE in tests/test-patchbomb to fix running this
test on FreeBSD and Solaris.
 2007-06-13 15:02:09 +03:00
Brendan Cully
d9c890b630 Make parents with a file but not a revision use working directory revision. 2007-06-14 10:58:49 -07:00
Giorgos Keramidas
0d93ef80bc test-patchbomb: sed -e may not work with extended regexps 
Non-GNU versions of the sed(1) utility (i.e. on Solaris or BSD)
may not support extended regexps (i.e. including \| branches),
or may need a special option to enable it (like -E instead of -e).

Expand the sed RE in tests/test-patchbomb to fix running this
test on FreeBSD and Solaris.
 2007-06-13 15:02:09 +03:00
Thomas Arendsen Hein
b1b749399a Correct tests/test-patchbomb* files: 
mv test-patchbomb test-patchbomb.out
hg revert -r 5ab985243f28 test-patchbomb
 2007-06-13 08:24:40 +02:00
Bryan O'Sullivan
323388d025 patchbomb: add --date option 2007-06-12 14:52:34 -07:00
Bryan O'Sullivan
d16530621b Don't validate email config if we're not sending email. 2007-06-12 14:44:47 -07:00
Brendan Cully
37671e0260 dispatch: restore a dropped shlex import 
Add test-dispatch as a place for command parsing and dispatch tests.
 2007-06-12 13:21:42 -07:00
Matt Mackall
1621c30af5 dispatch: use the repo path found by early parsing 
This lets us simplify things a bit.
 2007-06-11 21:09:24 -05:00
Matt Mackall
7daba33088 dispatch: move dispatching code to cmdutil 2007-06-11 21:09:24 -05:00
Alexis S. L. Carvalho
dd4d403b90 use .extend instead of .append in readtags 2007-06-04 00:24:48 -03:00
Matt Mackall
ac962c3cef commit: fix bug where dirstate for removed file is confused 
This fixes issue586
 2007-06-10 21:16:58 -05:00
Thomas Arendsen Hein
7a4d62e035 Removed trailing \n in calls to util.Abort() 2007-06-09 13:25:54 +02:00
Alexis S. L. Carvalho
50d5690f2a Avoid extra filelogs entries. 
Right now, there are some situations in which localrepo.filecommit can
create filelog entries even though they're not needed.  For example:

- permissions for a file have changed;

- qrefresh can create a filelog entry identical to its parent (see the
  added test);

- convert-repo creates extra filelog entries in every merge where the
  first parent has added files (for example, changeset ebebe9577a1a of
  the kernel repo added extra filelog entries to files in the
  arch/blackfin directory, even though the merge should only touch the
  drivers/ata directory).  This makes "hg log file" in a converted repo
  less useful than it could be, since it may mention many merges that
  don't actually touch that specific file.

They all come from the same basic problem:  localrepo.commit (through
filecommit) creates new filelog entries for all files passed to it
(except for some cases during a merge).

Patch and test case provided by Benoit.

This should fix issue351.
 2007-06-09 01:04:28 -03:00
Alexis S. L. Carvalho
a8f5faee29 Make sure the changelog mentions files whose flags changed 
These changes don't actually need a new filelog entry (see next patch),
but if we don't mention the files in the changelog, it becomes much
harder to find all changesets that touch a file (not even a
"hg log --removed file" will work).
 2007-06-09 01:04:28 -03:00
Alexis S. L. Carvalho
2f82b4ffa3 run-tests.py: set ui.slash = True 
This should make things easier for pysh.
 2007-06-08 23:49:12 -03:00
Alexis S. L. Carvalho
39ab533239 test-config-case: print only the Section we're interested in. 
This allows us to add additional settings to the global hgrc file
created by run-tests.py without breaking this test.
 2007-06-08 23:49:12 -03:00
Patrick Mezard
a55efff966 ui: make readsections() abort when configuration cannot be read. 2007-06-03 22:11:25 +02:00
Thomas Arendsen Hein
49220695bc Removed trailing whitespace and tabs from python files 2007-06-06 20:22:52 +02:00
Thomas Arendsen Hein
bed0d64777 Fixed test output for changed glog (. instead of @) 2007-06-06 19:06:43 +02:00
Thomas Arendsen Hein
cf1ee4e625 Issue a warning if "-r ." is used with two working directory parents. 
Rationale for not aborting instead:
The first parent is usually more important as it is the local branch
during a merge and commands like 'hg diff' and 'hg diff -r.' behave still
identically (except for the warning of course).

Added a test for log -r. with one and two parents.
 2007-06-06 19:05:18 +02:00
Alexis S. L. Carvalho
9473b6e676 test-serve: let run-tests.py kill the daemons 
If the daemons die while the tests are still running, we'll get additional
"killed!" messages, making the test fail.
 2007-06-05 19:26:36 -03:00
Joel Rosdahl
59069084bb Add test reproducing a bug in "hg serve -v" 2007-06-04 21:48:59 +02:00
Alexis S. L. Carvalho
ae21f631dc merge with crew-stable 2007-06-04 00:26:53 -03:00
Patrick Mezard
ed018bae98 Merge with crew-stable 2007-06-03 17:18:48 +02:00
Thomas Arendsen Hein
2366afd684 merge with stable 2007-06-01 19:49:09 +02:00
Thomas Arendsen Hein
3c2ee08111 Make "hg incoming -r revision_number" work for remote repos (issue566) 
Uses the remote repository's lookup method as pull does and only transfers
what is needed to calculate incoming changesets.

One minor problem:
As only the needed changesets are transfered and stored in a local bundle
repository, the tip tag of this bundle is shows despite not being the tip
changeset of the remote repository.
(see "+tag: tip" in tests/test-incoming-outgoing.out in this patch)
 2007-06-01 19:45:05 +02:00
Thomas Arendsen Hein
cc234197e2 Corrected similarity parameter used in test-addremove 
0.5 meant 50% in the early stages of addremove -s, now 50 has to be used.
 2007-06-01 16:02:49 +02:00
Thomas Arendsen Hein
128193f3e9 addremove: comparing two empty files caused ZeroDivisionError 
(found by Giorgos Keramidas)
 2007-06-01 16:00:40 +02:00
Patrick Mezard
9bf3ac6325 Test issue 562: .hgignore requires newline at end 2007-05-19 22:46:59 +02:00
Alexis S. L. Carvalho
5dde9c8a57 improve warning for hg add foo; hg mv foo bar 2007-07-11 19:56:16 -03:00
Alexis S. L. Carvalho
c2a8afba01 archive: add symlink support 2007-07-11 17:40:41 -03:00
Emanuele Aina
92444d96b1 purge: add --include and --exclude options 2007-05-11 17:05:44 +02:00
Patrick Mezard
0bf2bda86a Merge with crew-stable. 2007-05-19 22:51:43 +02:00
Eric Hopper
e075c7b81c Alter test to test import --exact to make sure it works with branches. 2007-05-17 20:09:49 -07:00
Eric Hopper
50863b1d0d Add a test for the Branch header being in hg export. 2007-05-17 20:09:44 -07:00
Brendan Cully
32c5d5cbaa Make mergepatch save queue now that qpush isn't. 2007-05-13 19:15:54 -07:00
Brendan Cully
b100fabe27 Fix up patchbomb test 2007-05-08 12:36:34 -07:00
Bryan O'Sullivan
5fe1c5d4b7 add test for patchbomb extension. 2007-05-08 12:20:13 -07:00
Matt Mackall
6bf7f7256d merge: fix spurious merges for copies in linear updates 
We make better use of contexts to accurately identify copies that
don't need merges.

Add a simple test and update other tests.
 2007-05-08 02:59:13 -05:00
Bryan O'Sullivan
fd12095b02 mq: add qgoto command. 2007-05-08 13:10:27 -07:00
Brendan Cully
6fae8c6b65 Fix test-patchbomb for crew 2007-05-08 13:08:20 -07:00
Matt Mackall
5fa7270b2d Merge with stable 2007-05-08 11:42:48 -05:00
Patrick Mezard
ad66e2aba5 Test qtop breaking when series ends with guarded patches. 2007-05-06 18:19:25 +02:00
Brendan Cully
fb4b5549c3 Add fast-forward branch merging 2007-05-06 20:27:45 -07:00
Patrick Mezard
2aa0553705 Merge with crew-stable. 
HG: changed hgext/mq.py
 2007-05-07 00:12:35 +02:00
Brendan Cully
46c9d09fa2 Also restore old rm -A behavior for inexact patterns 2007-04-30 09:32:44 -07:00
Brendan Cully
9759da5859 Fix rm -A with no patterns, which I just broke. 2007-04-30 09:13:27 -07:00
Brendan Cully
bd110b0cd3 Make rm --after simply mark files as removed, unless --force is also given 2007-04-30 08:51:59 -07:00
Alexis S. L. Carvalho
274bce0c1c run-tests.py: pass -L/--label to simplemerge 
This should give us conflict markers that don't change from one run
to another.

Remove some sed's/egrep's from some tests.
 2007-04-28 17:55:45 -03:00
Brendan Cully
86e588eafb Make copy --after work for files that have been hg added. 2007-04-24 18:43:18 -07:00
Thomas Arendsen Hein
1a74aebc73 Work around problem where 'del os.environ["FOO"]' doesn't update environment. 
test-hook failed since changeset f4d1d9e93f1a because of this on Solaris 8.
 2007-04-19 13:04:26 +02:00
Thomas Arendsen Hein
bc615bbf0b Use python instead of shell printf with \x for test-simplemerge-cmd 
Needed e.g. to be compatible with Solaris.
 2007-04-19 12:47:55 +02:00
Alexis S. L. Carvalho
a4fb0722ca change tests to use simplemerge by default 2007-04-16 20:17:39 -03:00
Alexis S. L. Carvalho
2fe1ec9254 polish the simplemerge command; add a test 2007-04-16 20:17:39 -03:00
Alexis S. L. Carvalho
f65315991b actually port simplemerge to hg 
- use bdiff instead of patiencediff;  this is a larger change, since
  bdiff works on 2 multi-line strings, while patiencediff works on 2
  lists;

- rename the main class from Merge3 to Merge3Text and add a Merge3
  class that derives from Merge3Text.  This new Merge3 class has
  the same interface from the original class, so that the tests
  still work;

  - Merge3 uses util.binary to detect binary data and raises
    util.Abort instead of a specific exception;

- don't use the @decorator syntax, to keep python2.3 compatibility;

- the test uses unittest, which likes to print how long it took to
  run.  This obviously doesn't play too well with hg's test suite,
  so we override time.time to fool unittest;

- one test has a different (but still valid) output because of the
  different diff algorithm used;

- the TestCase class used by bzr has some extras to help debugging.
  test-merge3.py used 2 of them:

  - log method to log some data

  - assertEqualDiff method to ease viewing diffs of diffs

  We add a dummy log method and use regular assertEquals instead of
  assertEqualDiff.

- make simplemerge executable and add "#!/usr/bin/env python" header
 2007-04-16 20:17:39 -03:00
Alexis S. L. Carvalho
50315bfe3b Import 3-way merge code from bzr 
merge3.py is imported as contrib/simplemerge
test_merge3.py is imported as tests/test-simplemerge.py
 2007-04-16 20:17:39 -03:00
Matt Mackall
e2dfe968ea Merge with stable 2007-04-16 12:37:30 -05:00
Kirill Smelkov
c46ae95f3f convert: svn -- fix tags handling 
They were simply not detected.
 2007-10-13 15:25:11 +04:00
Bryan O'Sullivan
4b4ad223ef test-convert-darcs: don't let $HOME/.darcs pollute the test environment 2007-10-10 15:48:08 -07:00
Bryan O'Sullivan
0ec99ed035 convert: refactor sink initialisation, to remove hardcoding of hg 
We also introduce options to explicitly set the source and destination
repository types.

Improve testing of corner cases a little.
 2007-10-10 15:42:00 -07:00
Patrick Mezard
59a5193f63 patch: fix git sendmail handling without proper mail headers 2007-10-08 22:20:23 +02:00
Patrick Mezard
91790f92bf Test darcs converter 2007-10-07 19:03:32 +02:00
Patrick Mezard
07f69a32a2 hghave: detect darcs client 2007-10-07 18:58:44 +02:00
Patrick Mezard
dc56a66c81 hghave: reorder check functions and entries 2007-10-07 18:58:36 +02:00
Patrick Mezard
be799c79c6 Test workingctx exec/link bit for copies. 
Also, make the test runnable on platforms without symlinks.
 2007-10-07 15:13:50 +02:00
Patrick Mezard
2eb7f085fc test-manifest: test symlink and exec bit display 2007-10-06 22:30:24 +02:00
Patrick Mezard
c9215420e8 Display symlink or executable bit with manifest -v 
New output looks like:

644   a
755 * b/a
644 @ l
 2007-10-06 22:30:22 +02:00
Alexis S. L. Carvalho
fa0374301e Always copy the necessary files before applying a git patch 
This patch removes the "copymod" attribute from the gitpatch
class.

AFAICS, that attribute was only used to delay the copying of
renamed/copied files if there are no other changes to the target,
but in this case, if there are changes to the source, we'll end
up copying the wrong version.

This should fix issue762.
 2007-10-06 15:30:15 -03:00
Patrick Mezard
0dd09ef0fc Test *_ISLINK merge environment vars 2007-10-05 23:01:38 +02:00
Bryan O'Sullivan
f5b570e3a6 run-tests.py: allow a different temporary directory to be specified 2007-10-05 12:42:52 -07:00
Bryan O'Sullivan
01e8a7db01 Update test for new output produced since e24568a05150 2007-10-05 12:30:19 -07:00
Bryan O'Sullivan
74de1ac8b8 Fix accidentally broken test. 2007-10-05 12:28:18 -07:00
Bryan O'Sullivan
1a3055eb4e Merge with crew. 2007-10-05 12:17:29 -07:00
Bryan O'Sullivan
a03fea73e0 Allow tests to run in parallel. 2007-10-05 12:17:01 -07:00
Bryan O'Sullivan
b1622da091 run-tests.py: reorder options alphabetically. 2007-10-05 09:30:02 -07:00
Alexis S. L. Carvalho
a305a3e419 convert_svn: add --filemap support 2007-10-04 23:21:37 -03:00
Alexis S. L. Carvalho
df6f43b4df convert_cvs: add --filemap support 2007-10-04 23:21:37 -03:00
Alexis S. L. Carvalho
b7d48206ca convert_git: add --filemap support 2007-10-04 23:21:37 -03:00
Alexis S. L. Carvalho
f951bc5803 mercurial_source: add --filemap support 2007-10-04 23:21:37 -03:00
Matt Mackall
24f40f64eb Merge with crew 2007-10-04 19:47:22 -05:00
Matt Mackall
3f58de820d merge: add debug diagnostics for findcopies 2007-10-04 19:44:37 -05:00
Patrick Mezard
755593a7fa Merge with crew-stable 2007-10-04 14:26:34 +02:00
Thomas Arendsen Hein
245381e916 test-convert-git: support older git client (1.4.4.4) 2007-10-04 14:23:28 +02:00
Patrick Mezard
01d91ed943 Merge with crew-stable 2007-10-03 21:08:37 +02:00
Christian Ebert
aa9b7d6cfb test-convert-cvs: handle older cvs client 2007-10-03 21:01:47 +02:00
Patrick Mezard
2b0b08ada6 Merge with crew-stable 2007-09-30 16:38:42 +02:00
Patrick Mezard
1ae2852b6f Test debugindexdot 2007-09-30 16:36:22 +02:00
Patrick Mezard
091596b961 Merge with crew-stable 2007-09-30 12:36:11 +02:00
Patrick Mezard
298631f312 Test mercurial convert sink removes empty directories. 2007-09-30 12:08:33 +02:00
Alexis S. L. Carvalho
07df6adfb5 revlog: fix revlogio.packentry corner case 
We want to store version information about the revlog in the first
entry of its index.  The code in packentry was using some heuristics
to detect whether this was the first entry, but these heuristics could
fail in some cases (e.g. rev 0 was empty; rev 1 descends directly from
the nullid and is stored as a delta).

We now give the revision number to packentry to avoid heuristics.
 2007-09-26 01:58:45 -03:00
Dirkjan Ochtman
7b9cb3b6fc Don't try to determine interactivity if ui() called with interactive=False. 
WSGI applications are not supposed to refer to sys.stdin. In af5aceab19f4,
hgweb and hgwebdir were fixed to pass interactive=False to their ui()'s, but
sys.stdin.isatty() was still called by the ui objects. This change makes sure
only the ui.fixconfig() method will call ui.isatty() (by making the
ui._readline() method, which is currently only called from ui.prompt(),
private). ui.fixconfig() is changed to let config files override the initial
interactivity setting, but not check isatty() if interactive=False was
specified in the creation of the ui.
 2007-09-25 19:05:34 +02:00
Alexis S. L. Carvalho
ddf41e005d Merge with crew-stable 2007-09-24 19:14:18 -03:00
Alexis S. L. Carvalho
6f75c91b5f convert_git: avoid returning two entries for the same file in getchanges 
This could happen in merge changesets if the merged file was different
from both parents.
 2007-09-24 19:00:11 -03:00
Alexis S. L. Carvalho
38a7ae7001 mq: fix qrefresh -e with no patches applied 2007-09-24 19:00:11 -03:00
Alexis S. L. Carvalho
bcee2981c6 copy: if destination ends with "/", make sure it's a directory 
Fixes issue724.
 2007-09-24 19:00:11 -03:00
Matt Mackall
1e7f28023a Merge with crew 2007-09-24 12:34:26 -05:00
Patrick Mezard
c6d86b7b87 Merge with crew-stable 2007-09-23 15:29:58 +02:00
Patrick Mezard
d611888360 Test renaming files brought by merge second parent (issue 746) 2007-09-23 14:40:44 +02:00
Patrick Mezard
f770ac70cd Merge with crew-stable 2007-09-22 18:56:36 +02:00
Patrick Mezard
091a0db4eb Test static-http calls on '/' URI (issue 747) 2007-09-22 18:52:26 +02:00
Matt Mackall
e8a1dfd594 convert-cvs: update test to pass on Linux 2007-09-21 17:25:25 -05:00
Patrick Mezard
d24e36a450 Merge with crew-stable 2007-09-14 23:10:41 +02:00
Patrick Mezard
7c438d2066 convert: test cvs repository conversion 2007-09-14 22:47:15 +02:00
Patrick Mezard
ee42bab2ca hghave: detect cvs and cvsps availability 
"cvsps -h" was returning 1 in cygwin, probably because CVSROOT was unset, which does not prevent it to work correctly.
 2007-09-14 22:17:53 +02:00
Patrick Mezard
6e671bc489 Merge with crew-stable 2007-09-11 23:38:29 +02:00
Patrick Mezard
5f594a636f Test parents behaviour with files. 2007-09-11 23:05:30 +02:00
Brendan Cully
92a19d3a72 mq: fix regression in c5d80ff6828f 
It caused qrefresh; qrefresh -X addedfile to leave the file as normal in dirstate.
It should be marked added on the second pass.
 2007-09-10 15:00:05 -07:00
Brendan Cully
c0a2a485b0 Update test-record for 7012707aa4c6 2007-09-06 18:12:36 -07:00
Thomas Arendsen Hein
2455f3e93d Forgot to quote "6^" in test-parentrevspec (see 1beb065d7447) 2007-09-04 18:37:28 +02:00
Patrick Mezard
a375f7f845 test-convert-hg-source: enforce conversion order with --date 2007-09-04 13:56:15 +02:00
Alexis S. L. Carvalho
7dac6f1262 convert: mercurial_source: also search for copies in modified files 
There are some corner cases where we may have a copy in a file that
isn't in the added list:

- the result of a hg copy --after --force

- after a merge across a (local) rename
 2007-09-01 02:49:18 -03:00
Alexis S. L. Carvalho
6309fee56a convert: clear the dirstate before a conversion, invalidate it afterwards 
Clearing it before the conversion protects us from whatever data were
there (file copies in particular).

Invalidating it after the conversion avoids writing a possibly
inconsistent dirstate to disk.
 2007-09-01 02:49:18 -03:00
Alexis S. L. Carvalho
41b6be949d convert: avoid dirstate checks; add a test 
During a conversion, the dirstate contents are not consistent - there
are files that may be missing from the dirstate and there may be files
that shouldn't be in the dirstate.

While this is not fixed, don't mark files as added - put them directly
in state 'n'ormal.
 2007-09-01 02:49:18 -03:00
Thomas Arendsen Hein
bf2d3bd959 Fix \ inside ` problem in test-convert-svn (avoids code duplication, too) 2007-08-31 12:54:07 +02:00
Thomas Arendsen Hein
f79502e9bd merge with crew-stable 2007-08-31 12:40:23 +02:00
Thomas Arendsen Hein
58eb01c17d Make test-convert-git compatible with other git versions (tested with 1.4.4.3) 2007-08-31 12:32:18 +02:00
Brendan Cully
2a5ee3fd3f Include . in PYTHONPATH (makes testing unbundled extensions easier) 2007-08-29 17:01:10 -07:00
Brendan Cully
f81247179c Make run-tests.py work when invoked outside of tests. 
This makes it usable for unbundled extensions.
 2007-08-29 16:50:21 -07:00
Brendan Cully
ff7b7ccc24 Merge with crew-stable 2007-08-29 16:19:27 -07:00
Brendan Cully
ebae83c8bb When reverting a file which was renamed, also revert the old name 2007-08-29 16:15:23 -07:00
Alexis S. L. Carvalho
a718b1f9b5 Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB 2007-08-28 22:48:25 -03:00
Patrick Mezard
8cbb2aa808 hghave: wrap command output matching 2007-08-27 22:17:51 +02:00
Patrick Mezard
52e5b2ea8e Test svn repository conversion 2007-08-27 22:17:51 +02:00
Patrick Mezard
2606bb2d09 hghave: detect subversion bindings availability 2007-08-27 22:17:51 +02:00
Patrick Mezard
cf49c2ef36 hghave: detect subversion client and admin tools availability 2007-08-27 22:17:51 +02:00
Patrick Mezard
9e5343f064 hghave: wrap command output matching 2007-08-27 22:17:51 +02:00
Patrick Mezard
6acdd7ff15 run-tests: append PYTHONPATH instead of overwriting it 
Optional dependencies like svn bindings not necessarily live in site-packages.
 2007-08-27 22:17:51 +02:00
Alexis S. L. Carvalho
369cb57512 Merge with crew-stable. 2007-08-27 14:55:33 -03:00
Alexis S. L. Carvalho
4bb4d97472 correctly record file-level history when the local side renames a directory 2007-08-27 14:21:04 -03:00
Alexis S. L. Carvalho
a409e26406 Avoid adding to the changelog executable files added by the second parent. 
This was a regression introduced by 349443e942a7.
 2007-08-27 14:21:04 -03:00
Alexis S. L. Carvalho
714fa94597 Merge with crew-stable 2007-08-27 02:21:58 -03:00
Alexis S. L. Carvalho
b7234419e2 clone: remove "file://" before making the path absolute 
This avoids writing bogus paths to .hgrc.  Fixes issue695.
 2007-08-27 01:44:35 -03:00
Alexis S. L. Carvalho
73454f8d16 pull -u: if "url#rev" was given, update to rev 2007-08-27 01:44:35 -03:00
Alexis S. L. Carvalho
616367be9a clone: if "url#rev" was given, update to rev 2007-08-27 01:44:35 -03:00
Alexis S. L. Carvalho
88d2731fa8 parseurl: also return the revision after the "#"; add a test 2007-08-27 01:44:35 -03:00
Alexis S. L. Carvalho
1e3fbe3765 pull -r: pass the revisions as the heads argument of findincoming 
This can make a hg pull -r faster if the remote repo has many heads,
and fixes an "abort: received changelog group is empty".
 2007-08-27 01:44:35 -03:00
Patrick Mezard
5d54b971c7 Merge with crew-stable 2007-08-26 16:49:26 +02:00
Patrick Mezard
26ffa26890 Test git repository conversion 2007-08-26 15:07:13 +02:00
Patrick Mezard
ce0d9a3c84 hghave: detect git availability 2007-08-26 15:35:57 +02:00
Benoit Boissinot
513ea49cfc improve error message for 'hg merge' when repo already at branchtip 2007-08-25 11:30:11 +02:00
Benoit Boissinot
db7ad2ab70 merge with crew-stable 2007-08-24 00:56:56 +02:00
Benoit Boissinot
b884c9144e fix test-permissions output 2007-08-24 00:56:08 +02:00
Benoit Boissinot
e52485e94a merge with crew-stable 2007-08-24 00:53:16 +02:00
Benoit Boissinot
cfb5e37845 testcase for issue705 (fixed by 739cbeba775b) 2007-08-24 00:52:28 +02:00
Alexis S. L. Carvalho
a345c2c9da merge: forcefully mark files that we get from the second parent as dirty 
After a hg merge, we want to include in the commit all the files that we
got from the second parent, so that we have the correct file-level
history.  To make them visible to hg commit, we try to mark them as dirty.

Unfortunately, right now we can't really mark them as dirty[1] - the
best we can do is to mark them as needing a full comparison of their
contents, but they will still be considered clean if they happen to be
identical to the version in the first parent.

This changeset extends the dirstate format in a compatible way, so that
we can mark a file as dirty:

Right now we use a negative file size to indicate we don't have valid
stat data for this entry.  In practice, this size is always -1.

This patch uses -2 to indicate that the entry is dirty.  Older versions
of hg won't choke on this dirstate, but they may happily mark the file
as clean after a full comparison, destroying all of our hard work.

The patch adds a dirstate.normallookup method with the semantics of the
current normaldirty, and changes normaldirty to forcefully mark the
entry as dirty.

This should fix issue522.

[1] - well, we could put them in state 'm', but that state has a
different meaning.
 2007-08-23 01:48:29 -03:00
Benoit Boissinot
13bbfcaf55 make hg add of a removed file unremove the file 
if a file was removed, hg add shouldn't mark the file
as added, but as normal

see issue683
 2007-08-21 02:13:32 +02:00
Alexis S. L. Carvalho
3b929dfbb5 path_auditor: cache names of audited directories 
We use a separate cache to avoid problems with

audit = path_auditor(repo.root)
audit("subrepo")
audit("subrepo/file")

whitelisting "subrepo" (which is fine) and then using the same whitelist
with "subrepo/file" (which is not fine).

Since we create a separate path_auditor for every path on the command line,
a "hg add dir/a dir/b dir/c" will still lstat dir 3 times just to audit
the paths.
 2007-08-18 21:36:10 -03:00
Thomas Arendsen Hein
2f533bf4a6 Quote ^ and ~ chars in test-parentrevspec. 
At least ^ causes problems on some sh implementations.
 2007-08-18 20:21:14 +02:00
Alexis S. L. Carvalho
1ee06d75a7 Merge with crew-stable 2007-08-17 23:20:13 -03:00
Alexis S. L. Carvalho
de2d9c54e8 run-tests.py: pass --install-scripts to setup.py 
This avoids possible problems when the user has a ~/.pydistutils.cfg.
Fixes issue638.  Patch provided by Ralf Schmitt.
 2007-08-17 22:43:38 -03:00
Alexis S. L. Carvalho
e60e53981a Add parentrevspec extension 2007-08-17 17:33:27 -03:00
Matt Mackall
c08427e0e8 dispatch: move command dispatching into its own module 
- move command dispatching functions from commands and cmdutil to dispatch
- change findcmd to take a table argument
- remove circular import of commands in cmdutil
- privatize helper functions in dispatch
 2007-08-15 16:55:13 -05:00
Matt Mackall
abd8b8c87b Merge with stable 2007-08-15 15:56:39 -05:00
Matt Mackall
8f44013035 test-grep: use lowercase hg command 2007-08-15 15:30:33 -05:00
Patrick Mezard
4ad44c80f1 Merge with crew-stable 2007-08-15 16:43:40 +02:00
Patrick Mezard
04cf5bb0f5 test-grep: test issue 685 2007-08-15 16:18:40 +02:00
Patrick Mezard
8169b36e09 Merge with crew-stable 2007-08-14 19:30:14 +02:00
Patrick Mezard
e1556e1cd2 hghave: test hotshot dependencies (debian does not provide profile) 2007-08-14 19:25:49 +02:00
Patrick Mezard
f54fb44413 Merge with crew-stable 2007-08-14 19:06:10 +02:00
Patrick Mezard
3f797895fa test-profile: fix grep, check hotshot availability 2007-08-14 18:53:45 +02:00
Patrick Mezard
1c4c581aa9 Merge with crew-stable 2007-08-14 16:30:38 +02:00
Patrick Mezard
0e4dfe7a43 Test --time, --profile and --lsprof 2007-08-14 16:27:35 +02:00
Alexis S. L. Carvalho
a866998db8 merge with crew-stable 2007-08-12 12:43:52 -03:00
Alexis S. L. Carvalho
664fc9f5dd merge: fix a copy detection bug (issue672) 
When merging rev1 and rev2, we want to search for copies that happened
in rev1 but not in rev2 and vice-versa.  We were starting the search at
rev1/rev2 and then going back, stopping as soon as we reached the revno
of the ancestor, but that can miss some cases (see the new
test-issue672).

Now we calculate the revisions that are ancestors of rev1 or rev2 (but
not both) and make sure the search doesn't stop too early.

Simplified test provided by mpm, based on a test case provided by
Edward Lee.
 2007-08-12 12:15:10 -03:00
Thomas Arendsen Hein
beed59edcd merge with crew-stable 2007-08-11 13:35:25 +02:00
Thomas Arendsen Hein
9c6e25abcf Added test for commands.dispatch (especially 88803a69b24) 2007-08-11 13:34:19 +02:00
Thomas Arendsen Hein
87b480f2bb test-context.py: Don't create second repo instance (fixed since 3300640607e3) 2007-08-11 13:17:24 +02:00
Thomas Arendsen Hein
467db29b4a Print less scary message if the system supports symlinks: 
"Skipping test-no-symlinks: system supports symbolic links"
instead of
"Skipping test-no-symlinks: unexpected feature: symbolic links"
 2007-08-11 12:47:58 +02:00
Thomas Arendsen Hein
5f273063c7 Hide absolute path from test-no-symlinks output. 
And add missing eol and remove trailing space which where introduced by the
patches adding this test.
 2007-08-11 12:36:04 +02:00
Bryan O'Sullivan
1b98353d91 Make audit_path more stringent. 
The following properties of a path are now checked for:

    - under top-level .hg
    - starts at the root of a windows drive
    - contains ".."
    - traverses a symlink (e.g. a/symlink_here/b)
    - inside a nested repository

If any of these is true, the path is rejected.

The check for traversing a symlink is arguably stricter than necessary;
perhaps we should be checking for symlinks that point outside the
repository.
 2007-08-10 10:46:03 -07:00
Bryan O'Sullivan
3899e7b033 mq: teach qpop about symlinks 2007-08-09 20:16:00 -07:00
Bryan O'Sullivan
c42c6ca456 manifest: accept -r for rev specification 2007-08-09 19:42:33 -07:00
Bryan O'Sullivan
46880a1c4f record: improve docs, improve prompts 2007-08-09 17:29:16 -07:00
Patrick Mezard
6650213c7b Merge with crew-stable 2007-08-09 23:29:29 +02:00
Patrick Mezard
b69056f11a hghave: prefix temporary files with "hg-hghave-" 2007-08-09 23:14:52 +02:00
Patrick Mezard
0bbfa25ca1 test-no-symlinks: rename .bundle into .hg for consistency. 2007-08-09 23:14:50 +02:00
Patrick Mezard
7f6bafcf19 Merge with crew-stable 2007-08-08 23:11:12 +02:00
Patrick Mezard
17afbade48 Test symlink handling on platform not supporting them 2007-08-08 22:47:18 +02:00
Patrick Mezard
d0f548d7df hghave: feature absence can be checked by prefixing with 'no-' 2007-08-08 23:07:39 +02:00
Benoit Boissinot
ce6a51c4eb refactor options from cmdtable 
- add extracommitopts for user and date
- factor stuff
 2007-08-08 12:27:20 +02:00
Thomas Arendsen Hein
e34927453f Remove trailing spaces, fix indentation 2007-08-07 10:28:43 +02:00
Thomas Arendsen Hein
a799589be4 merge with crew-stable 2007-08-07 10:28:14 +02:00
Thomas Arendsen Hein
001b7980f8 Remove trailing spaces 2007-08-07 10:24:33 +02:00
Brad Schick
18eb282ff7 extdiff: do single file diffs from the wc with no copy 
Extdiff was always making a temporary directory and copying files even when not required. This change makes extdiff avoid the copy when diffing a single file that lives in the wc. This lets external diff tools edit the working copy file directly. It also lets other extensions resuse the functions in extdiff and get in-place diffs.
 2007-08-06 14:50:57 -07:00
Brad Schick
eec22b0f45 extdiff: made it less chatty in non-verbose mode 
Made the status info only display in verbose mode since most hg commands aren't so chatty. This also makes it cleaner for other extensions to call extdiff.
 2007-08-06 14:42:11 -07:00
Bryan O'Sullivan
4b5691e253 record: work properly if invoked in a subdirectory 2007-08-06 12:53:17 -07:00
Thomas Arendsen Hein
bbd3ff0014 merge with crew-stable 2007-08-06 20:31:15 +02:00