facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity
4,734 Commits 24 Branches 62 Tags 324 MiB
cfe7a0a522
Commit Graph

1025 Commits

Author SHA1 Message Date
Thomas Arendsen Hein
46055c07ca sync with -stable 2007-01-02 22:40:52 +01:00
Matt Mackall
2e27ddd82b symlinks: use is_link wherever is_exec is used 2006-12-29 20:04:31 -06:00
Benoit Boissinot
9b95329263 various doc fixes 
- update can no longer be used to merge
- short summary start with lowercase
- add merge to short help list
- fix tests
 2006-12-29 06:37:43 +01:00
Benoit Boissinot
4247929c84 fix hg help <ext> for extension that do not define any command 
solve issue462
 2006-12-26 21:59:01 +01:00
Thomas Arendsen Hein
28f17c0cc7 Improved error message for extensions overriding commands (with test): 
- Old text "module foo overrides bar" was misread as overriding module bar.
- Only print a single warning line per extension instead of one for each
  command.
 2006-12-26 15:33:50 +01:00
Thomas Arendsen Hein
3b41677e92 sync with stable 2006-12-26 14:54:48 +01:00
Thomas Arendsen Hein
7701e96286 Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm. 2006-12-26 14:17:48 +01:00
Benoit Boissinot
184e223932 test-manifest-merging: we only need to remove files 2006-12-24 22:28:01 +01:00
Benoit Boissinot
df9bc9df7c test-manifest-merging: we only need to remove files 2006-12-24 22:28:01 +01:00
Brendan Cully
15d31f9f1f Make test-manifest-merging less likely to delete the whole filesystem 2006-12-22 16:29:35 -08:00
Brendan Cully
1fb375cdf0 Make test-manifest-merging less likely to delete the whole filesystem 2006-12-22 16:29:35 -08:00
Benoit Boissinot
e55b0be33e grep: remove count handling, simplify, fix issue337 2006-12-22 22:51:39 +01:00
Benoit Boissinot
0c9cf6b950 grep: incrementing is always False during 'iter' 2006-12-22 22:16:05 +01:00
Brendan Cully
264442a0e4 Merge with mpm 2006-12-20 12:07:02 -08:00
Brendan Cully
c1a572ba46 hgweb: simple tests 2006-12-19 17:14:45 -08:00
Matt Mackall
671ae9b9ab Move test suite docs to the wiki 2006-12-19 16:38:14 -06:00
Matt Mackall
887599574c Sync with -stable 2006-12-17 21:48:22 -06:00
Benoit Boissinot
fc997dfbf2 fix calculation of new heads added during push with -r 
fix issue450
 2006-12-17 05:00:22 +01:00
Thomas Arendsen Hein
f2c2df1ab1 merge with crew-stable 2006-12-16 23:36:06 +01:00
Thomas Arendsen Hein
c72030a3d2 Adjust test-help output for the change in 28dd65def6cd. 2006-12-16 23:33:24 +01:00
Thomas Arendsen Hein
1d64670235 Fix test-hup for different output of ls on at least MacOS X and Solaris 8. 2006-12-16 23:24:30 +01:00
Thomas Arendsen Hein
c0034c572a doc fix: hg tags defaults to current parent revision, too. 
Additionally use better language for the help text for tag,
cat and manifest.
 2006-12-16 22:58:10 +01:00
Thomas Arendsen Hein
fb1cbb4570 doc string fix: hg cat and manifest default to current parent revision. 2006-12-16 22:33:39 +01:00
Brendan Cully
8c26621151 Merge with crew-stable 2006-12-15 18:38:09 -08:00
Thomas Arendsen Hein
a6c0381996 Don't use node length for calculating revision number length. 
Done by moving repo.lookup of revisions from commands.export to patch.export
 2006-12-15 19:30:20 +01:00
Thomas Arendsen Hein
f0c446ce6e Make sequence number on hg export start at 1 (as documented for %n). Add test. 2006-12-15 19:09:10 +01:00
Mathieu Clabaut
35ae1218d2 Add sending date to notify message. 
When using SMTP, no date field was set into the message, which causes it to be
displayed as being send on 1st january 1970 on most MUA.
 2007-05-24 16:32:38 +02:00
Brendan Cully
19123a0330 Merge with main 2006-12-14 13:49:33 -08:00
Thomas Arendsen Hein
429e98a404 Corrected synopsis for many commands. 
Use CMD instead of FILE for -e and --remotecmd (thanks, Neal Becker)
 2006-12-14 19:30:18 +01:00
Matt Mackall
2623870448 Remove deprecated old-style branch support 2006-12-12 18:16:23 -06:00
Thomas Arendsen Hein
ec97d785b1 Fix test output for test-mq-guards (changed by e7ca2aa11f8f) 2006-12-12 19:11:01 +01:00
Thomas Arendsen Hein
a721ac99f0 Add instructions how to redo/finish failed merge with local working directory. 
d29fcc4d1e2a already implemented this for branch merges.
 2006-12-11 18:09:52 +01:00
Alexis S. L. Carvalho
63ae667098 Use UTF-8 in .hg/branch 2006-12-10 20:35:28 -02:00
Matt Mackall
6d9bbc8702 Merge Benoit's .hg/store support 2006-12-10 02:11:02 -06:00
Matt Mackall
6665cfa7a3 Add some remedies and a username check to debuginstall 2006-12-10 01:05:00 -06:00
Matt Mackall
306a24652c Make debuginstall actually attempt to use external patch and merge 
This will catch some tricky problems with tools and setup.
 2006-12-10 00:44:52 -06:00
Matt Mackall
a9176a1e50 Make test-encoding return 0 2006-12-10 00:06:31 -06:00
Matt Mackall
135cce014c Add debuginstall command to do basic install tests 2006-12-10 00:05:47 -06:00
Matt Mackall
03f3b2efc4 make transcoding more robust 
default to ASCII
abort if unknown encoding
wrap abort strings with _
add test
 2006-12-09 12:46:01 -06:00
Thomas Arendsen Hein
731e6e0280 Show the destionation for clone if not specified manually. 2006-12-09 14:19:52 +01:00
Thomas Arendsen Hein
092e05b0b9 Fixes test-encoding for python2.3 and minor cleanups: 
- Use koi8-r instead of euc-jp, as the later isn't available in python2.3.
- Add unicode representation for latin1 e', too.
- Use date "1000000 0" like in other tests (though not strictly needed
  because we no longer use %c as default datestr format).
 2006-12-09 11:16:27 +01:00
Matt Mackall
daf6a67d1c Fix log regression where log -p file showed diffs for other files 2006-12-08 20:44:58 -06:00
Alexis S. L. Carvalho
edf9fef62b Allow the user to specify the fallback encoding for the changelog 
Example: use EUC-JP instead of ISO-8859-1:

[ui]
fallbackencoding = EUC-JP
 2006-12-08 22:01:05 -02:00
Thomas Arendsen Hein
82505cdc53 Removed unknown option -t in test-status 2006-12-08 23:33:32 +01:00
Matt Mackall
3d47c99e83 Merge with crew 2006-12-08 15:05:39 -06:00
Matt Mackall
a32d76f358 Add doc notes about revert and hg status vs diff 2006-12-08 14:55:45 -06:00
Alexis S. L. Carvalho
2b3be537b8 log: convert branch names to the local encoding 2006-12-08 01:36:50 -02:00
Alexis S. L. Carvalho
8e669882ac fix hg diff -r '' 2006-12-07 14:15:11 -02:00
Matt Mackall
54ad6abe29 Update tests 2006-12-06 13:13:44 -06:00
Matt Mackall
9630fc215f parsedate: use Abort rather than ValueError 2006-12-06 13:13:26 -06:00
Thomas Arendsen Hein
f6d571d204 Don't report an error when closing heads during local push (issue387) 2006-12-05 23:25:28 +01:00
Thomas Arendsen Hein
f18c368506 Use python instead of shell printf with \x sequences for test-encoding. 
Needed e.g. to be compatible with Solaris.
 2006-12-05 11:23:37 +01:00
Benoit Boissinot
e005ffc8c4 switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
Benoit Boissinot
69d31c9562 add "requires" file to the repo, specifying the requirements 2006-12-10 00:06:59 +01:00
Alexis S. L. Carvalho
7d0dc1d604 make hg commit <dirname> work again 2006-11-21 20:00:15 -02:00
Matt Mackall
880daa82ce Make quoting in test-encoding simpler 2006-12-04 14:32:02 -06:00
Matt Mackall
d128a67002 update test-debugcomplete 2006-12-04 01:21:53 -06:00
Matt Mackall
18df2fdfd7 test-encoding: copy a bundle from TESTDIR rather than constructing one 2006-12-03 17:28:58 -06:00
Matt Mackall
1300ae1a67 Hex-encode ! in test-encoding printf 
Naked ! tends to confuse shells
 2006-12-03 16:51:50 -06:00
Matt Mackall
37b816aaf1 Add output for encoding test 2006-12-03 16:31:25 -06:00
Matt Mackall
0849854893 Add a charset encoding test case 2006-12-03 16:16:33 -06:00
Matt Mackall
ab12bf1889 tests: set a default encoding for running tests (ASCII) 2006-12-03 16:16:33 -06:00
Alexis S. L. Carvalho
1f3671ab6b fix qseries -v and guards interaction 
- rename "status" variable to avoid shadowing an argument
- use a better test to determine whether a patch is applied
 2006-12-02 18:41:07 -02:00
Alexis S. L. Carvalho
e953792af4 Ignore all errors while parsing the branch cache. 2006-12-02 03:38:55 -02:00
Alexis S. L. Carvalho
b23caa6548 small fixes for test-newbranch 
- hg tip doesn't use the branch cache; use hg log -r in its place
- commit doesn't use a HG_MERGE environment variable
- change the dates from "0 0" to "1000000 0"
 2006-12-02 03:16:17 -02:00
Brendan Cully
77c7691d79 transplant: log source node when recovering too. 2006-12-01 15:00:33 -08:00
Thomas Arendsen Hein
9e4b3b8023 Don't require a diff which accepts the -N option. 2006-12-01 22:29:47 +01:00
Thomas Arendsen Hein
f3e9b24c98 Compatibility fix for 'ln -sf'. 
ln of Solaris 8 only accepts "ln -f -s" (in that order), but as the -f isn't
needed here, I simply dropped it.
 2006-12-01 22:09:05 +01:00
Alexis S. L. Carvalho
ea7eb1125c additional fixes for issue436 2006-12-01 16:18:16 -02:00
Thomas Arendsen Hein
ecaffdb830 Fix test-rename-dir-merge for different implementations of ls. 2006-12-01 15:40:23 +01:00
Thomas Arendsen Hein
567a43dbef Fix test-notify for systems without or with a different version of diffstat. 
Some diffstat versions say "1 file changed", others "1 files changed".
 2006-12-01 14:46:05 +01:00
Benoit Boissinot
14bbb468b3 add test for issue436 2006-12-01 09:42:07 +01:00
Matt Mackall
c571577922 add test for the notify extension 2006-12-01 01:29:13 -06:00
Matt Mackall
2085d36412 make manifest friendlier 
switch to using context code
..which uses first parent by default
show file hashes only with debug switch
show permissions with verbose
fix up tests
 2006-11-30 22:38:48 -06:00
Matt Mackall
d664d787b4 Add missing test output 2006-11-30 19:50:28 -06:00
Matt Mackall
b24119a251 Fix test permission 2006-11-30 18:22:44 -06:00
Matt Mackall
05748f203d merge: handle directory renames 
commit: handle new copy dirstate case correctly
findcopies:
 keep a map of all copies found for directory logic
 add dirs filter
 check for merge:followdirs config option
 generate a directory move map
 find files that match directory move map
manifestmerge:
 add directory rename cases
applyupdates:
 skip actions with None file
 add "d" action
recordupdates:
 add "d" action
add simple directory rename test
 2006-11-30 17:36:33 -06:00
Matt Mackall
f9ab52977a merge: only store one direction of copies in the copy map 
simplify checkpair
generate copied hash from copy map
make copy cases more symmetrical
 2006-11-30 17:36:33 -06:00
Matt Mackall
8732a61bab merge: report destinations of moves in merge action messages 2006-11-30 17:36:33 -06:00
Brendan Cully
deae5133ad transplant: recover added/removed files after failed application 2006-11-30 13:51:58 -08:00
Brendan Cully
e5abdcc7fc transplant: fix --continue; add --continue test 2006-11-30 11:09:25 -08:00
Thomas Arendsen Hein
aaab521292 Make sed expression in test-committer compatible with GNU sed 3.x. 2006-11-29 08:49:45 +01:00
Benoit Boissinot
3bad25e752 only print a warning when no username is specified 
- revert most of 8b55c0ba
- display the username during interactive commit
 2006-11-28 21:16:05 +01:00
Benoit Boissinot
a6e6999181 add test for issue433 2006-11-28 11:28:45 +01:00
Alexis S. L. Carvalho
3ef2e9ed94 fix hg log -r '' 2006-11-27 22:56:26 -02:00
Alexis S. L. Carvalho
7781594dc0 handle files with more than one git binary patch 2006-11-27 22:03:36 -02:00
Alexis S. L. Carvalho
b0141a470e handle files with both git binary patches and copy/rename ops 2006-11-27 22:03:31 -02:00
Brendan Cully
dc483d8d44 Add transplant extension 2006-11-27 15:13:01 -08:00
Benoit Boissinot
684e2e23c3 don't create the .hg/data at init time 2006-11-27 22:22:44 +01:00
Giorgos Keramidas
186991c839 Expand test-commit to cover one of the recent bugs. 2006-11-22 00:53:56 +02:00
Alexis S. L. Carvalho
6d99bd2633 Don't generate git patches that rename a file to multiple destinations 
With this patch, instead of generating N renames, we'll generate
1 rename and N-1 copies.

Ideally the rename should come after the copies instead of before
them, but that'd be harder to do.
 2006-11-20 19:32:46 -02:00
Alexis S. L. Carvalho
7f7845c518 handle git patches that rename a file to more than one destination 2006-11-20 19:32:45 -02:00
Alexis S. L. Carvalho
f6e774dd91 qrefresh: fix handling of copies in the fast path 2006-11-20 19:32:43 -02:00
Alexis S. L. Carvalho
63b6839f96 qrefresh: fix handling of added files (including copies) in the slow path 2006-11-20 19:32:42 -02:00
Alexis S. L. Carvalho
b298d93260 add --git option to qdiff 2006-11-20 19:32:40 -02:00
Alexis S. L. Carvalho
f2de15a6f8 diff: better detection of renames when comparing with the working dir. 2006-11-20 19:32:38 -02:00
Alexis S. L. Carvalho
bc9e70b94a fix typo in mercurial/patch.py 2006-11-20 19:32:37 -02:00
Alexis S. L. Carvalho
fdbef41b13 renamedbetween: only return (file, node) pairs that exist in the original rev 2006-11-20 19:32:36 -02:00
Alexis S. L. Carvalho
588b7cf1f1 diff: improve detection of renames when diffing across many revisions 2006-11-20 19:32:35 -02:00
Mathieu Clabaut
6971cd5b8c Issue424: mq patch loses guard when qrenamed 2006-11-19 23:47:19 +01:00
Matt Mackall
303ec3f442 correct remote heads test in prepush 2006-11-19 16:32:36 -06:00
Alexis S. L. Carvalho
3a2243d8f7 fix qseries -v when there are unapplied patches 2006-11-19 17:01:59 -02:00
Alexis S. L. Carvalho
6e218edeb5 Avoid looking up usernames if the current user owns the .hgrc file 
Converting uids into usernames may be somewhat expensive when NIS
or LDAP is involved.
 2006-11-18 23:51:14 -02:00
Alexis S. L. Carvalho
858dee209b Revert almost all of 0ab603017f82; add a test 
Because of file copies, we should update the manifest dict only after
committing all files.
 2006-11-18 19:44:42 -02:00
Matt Mackall
f9f3aa2d91 avoid unnecessary copy merges 2006-11-18 11:34:19 -06:00
Matt Mackall
37174271f4 refactor debugrenamed 2006-11-15 15:51:58 -06:00
Matt Mackall
f40fcaac75 Refactor log ui buffering and patch display 2006-11-13 13:26:57 -06:00
Matt Mackall
6b93d4c0fd tests: add -i switch 
Prompt to accept changes for tests where output changed
 2006-11-08 13:20:08 -06:00
Matt Mackall
4dc56ee619 tests: add -R switch 
Restarts at first .err file if one exists, otherwise runs all tests
 2006-11-08 13:20:08 -06:00
Matt Mackall
a6ea08deb0 tests: sort test list if running all tests 2006-11-08 13:20:08 -06:00
Matt Mackall
6b5e168d5c Fix up parent display in logging 
For changesets with a first parent nullid, but not rev 0, we ought to
display a null parent.
 2006-11-07 14:04:15 -06:00
Matt Mackall
6239f7b678 Clarify untracked file merge message 2006-11-01 21:47:55 -06:00
Benoit Boissinot
7d00e37112 issue352: disallow '\n' and '\r' in filenames (dirstate and manifest) 2006-11-01 17:56:55 +01:00
Benoit Boissinot
e12d0530f2 merge with crew 2006-10-31 13:03:52 +01:00
Benoit Boissinot
3f2046d235 Backed out changeset 0fc94973be4ffeb0b5ace8a920dec676a9a51130 2006-10-31 13:02:49 +01:00
Brendan Cully
2e8580188f test for git empty new files 2006-10-30 16:14:38 -08:00
Benoit Boissinot
58322272ec allow update to switch to a different branch if the repo is clean 2006-10-29 13:08:10 +01:00
Alexis S. L. Carvalho
17f016acd0 Correct optimization from 56bc6966622e; add a test. 
If there are two (or more) heads that point to the same .hgtags
node, we can safely skip parsing the file in all but the last head.
(In 56bc6966622e, we were parsing the file in the first head and
skipping all the others.)
 2006-10-28 23:37:59 -03:00
Thomas Arendsen Hein
11cdc6b21b Merge with upstream 2006-10-27 23:09:46 +02:00
Matt Mackall
53e3681702 Fixups for hg grep 
- kill trimuser function
- remove ucache
- simplify descending logic
- fix files with matches logic
- correct tests
 2006-10-26 14:04:58 -05:00
Alexis S. L. Carvalho
cb59e4de82 save settings from untrusted config files in a separate configparser 
This untrusted configparser is a superset of the trusted configparser,
so that interpolation still works.

Also add an "untrusted" argument to ui.config* to allow querying
ui.ucdata.

With --debug, we print a warning when we read an untrusted config
file, and when we try to access a trusted setting that has one value
in the trusted configparser and another in the untrusted configparser.
 2006-10-26 19:25:45 +02:00
Alexis S. L. Carvalho
c44cea1532 Only read .hg/hgrc files from trusted users/groups 
The list of trusted users and groups is specified in the [trusted]
section of a hgrc; the current user is always trusted; "*" can be
used to trust all users/groups.

Global hgrc files are always read.

On Windows (and other systems that don't have the pwd and grp modules),
all .hg/hgrc files are read.

This is essentially the same patch that was previously applied as
revision f077d29b114d.
 2006-10-26 19:25:44 +02:00
Matt Mackall
ae91bf4e42 Update tests for removed commands 2006-10-25 18:31:49 -05:00
Matt Mackall
dda61fef33 Remove old fish-merge test 2006-10-25 16:45:39 -05:00
Thomas Arendsen Hein
47d731406a Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. 2006-10-25 18:45:18 +02:00
Alexis S. L. Carvalho
846337c179 Test that we notice the empty files from the second parent during a merge 
This didn't work with 0.9.1, but was fixed by 41b753e617ee.
 2006-10-25 02:51:27 -03:00
Matt Mackall
8b1ec529ff Deprecate old --branch/branches options 2006-10-24 17:07:11 -05:00
Matt Mackall
afebc36749 add branch and branches commands 2006-10-24 16:49:36 -05:00
Alexis S. L. Carvalho
a9ec95a18c test-mq-caches: look up a revision that does not exist to force cache creation 2006-10-24 17:49:48 -03:00
Brendan Cully
45cd7b7440 Merge with mpm 2006-10-24 13:42:21 -07:00
Matt Mackall
49503fb772 Merge with crew 2006-10-24 13:46:04 -05:00
Alexis S. L. Carvalho
aa3a52a4cd make mq play nicely with the branch cache 
- if no patches are applied, don't do anything different

- if the cache includes valid data from one of the patch revisions,
  use the cache, but don't save anything new

- if the cache has data from before the patch revisions only,
  save what the list of branches would be without the patch revisions
 2006-10-23 23:32:56 -03:00
Thomas Arendsen Hein
37655ca869 Commit username: Better error message, abort on empty name, fix documentation. 2006-10-23 14:56:51 +02: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
Alexis S. L. Carvalho
acb8dbb57f Don't use test -e in tests - sh doesn't like it on Solaris 2006-10-18 18:47:50 -03:00
Alexis S. L. Carvalho
bb1e7c9b30 Update tests output 2006-10-18 18:44:23 -03:00
Benoit Boissinot
dc9483558a makes username mandatory 2006-10-18 22:24:03 +02:00
Matt Mackall
aa8e8c430f Use file contexts in tags code 2006-10-18 14:14:59 -05:00
Brendan Cully
65eede0479 mq: test case for issue399 2006-10-18 10:37:34 -07:00
Thomas Arendsen Hein
d4f2f71b1f Extended templating test for new branches and extra changeset info. 2006-10-18 18:10:21 +02:00
Thomas Arendsen Hein
4d2c842ef7 Don't show empty list of files in hg log -v. 2006-10-18 12:26:12 +02:00
Thomas Arendsen Hein
525802e3bf Adjust default cmdline style to really match verbose/debug log. 2006-10-18 12:17:02 +02:00
Thomas Arendsen Hein
15bba38f6c Add test for invalid branch cache (fixed by 7f2cd09b4f33) 2006-10-18 10:35:14 +02:00
Eric Hopper
badf39617f Testing the new changegroupsubset remote function in the ssh 
and http protocols.
 2006-10-18 02:14:26 -05:00
Matt Mackall
04360912e9 Merge with crew 2006-10-17 19:04:13 -05:00
Matt Mackall
bd3a8da1a7 Merge with crew 2006-10-17 18:54:37 -05:00
Matt Mackall
e8b51baf29 Add some basic branch name tests 2006-10-17 18:48:41 -05:00
Alexis S. L. Carvalho
1c418d136e use ui.readsections in the acl extension 2006-10-17 17:04:26 -03:00
Alexis S. L. Carvalho
35d879891a bundlerepo: avoid exception in __del__ when the bundle doesn't exist 
$ hg -R bundle://foo.hg
abort: No such file or directory: foo.hg
Exception exceptions.AttributeError: "'bundlerepository' object has no attribute 'bundlefile'" in <bound method bundlerepository.__del__ of <mercurial.bundlerepo.bundlerepository object at 0xa7ab9fac>> ignored
 2006-10-16 20:38:04 -03:00
Alexis S. L. Carvalho
241db87af8 portability fixes for some tests 
Apparently the ls on OS X 10.3.9 exits with success even if the file
given on the command line doesn't exist
 2006-10-16 18:01:25 -03:00
Alexis S. L. Carvalho
b760f2d395 Add a test for the acl extension 2006-10-16 15:38:53 -03:00
Alexis S. L. Carvalho
a85d162373 Use a case-sensitive version of SafeConfigParser everywhere 
This change has the potential to break existing setups, but the current
behaviour (the keys in configuration files are always lower-cased) can
bite us in a few places:

- no way to use a Command in [defaults]
- hgext.Extension doesn't work in [extensions]
- you can't use an Upper/case/PATH in the [paths] section of hgweb.config
- you can't (easily) protect paths with upper-case letters with the
  acl extension
- you can't specify a /Path/TO/a/rEPO in the [reposubs] section for
  the notify extension
 2006-10-16 15:38:53 -03:00
Thomas Arendsen Hein
a0cc28f430 merge with main 2006-10-16 09:23:26 +02:00
Brendan Cully
f4b9a43bc9 Test annotate using named rev instead of linkrev 2006-10-15 20:57:30 -07:00
Matt Mackall
384f4460ac merge: if filemerge skips merge, report as updated 2006-10-15 16:18:09 -05:00
Thomas Arendsen Hein
ccb1957113 Test for 1de7d8df2123 (update dirstate correctly for non-branchmerge updates) 
(Test case created by Johannes Hofmann)
 2006-10-14 10:53:29 +02:00
Alexis S. L. Carvalho
38eb833dca use short hashes with diff -v 2006-10-13 15:34:35 -03:00
Brendan Cully
db101c8e2b Test case for log --copies on non-linear manifests (issue391) 2006-10-13 09:58:55 -07:00
Alexis S. L. Carvalho
189bc7b5b8 portability fix for test-ssh 
The __del__ method of sshrepo reads the stderr of the remote process
until EOF and prints it.

If an exception is raised, this method ends up being called:
- on Linux: after the "abort: ..." message is printed
- on OS X: before the "abort: ..." message is printed

This patch explicitly flushes the stderr of the remote process before
raising a RepoError.
 2006-10-12 20:45:25 -03:00
Alexis S. L. Carvalho
f0031e0717 rawcommit: add removed files to the changelog file list 
patch by tonfa.
 2006-10-12 19:26:06 -03:00
Brendan Cully
9703cb03d8 Update test-mq-qdelete to use qdel -r 2006-10-12 14:19:34 -07:00
Brendan Cully
5bda764afc mq: make qdelete without -k or a subrepository delete all patches 2006-10-12 14:02:41 -07:00
Brendan Cully
6d19589c0b Add test for git binary diff support 2006-10-12 09:17:16 -07:00
Benoit Boissinot
a1bd76f99b nodesbetween: fix a bug with duplicate heads 2006-10-12 11:40:26 +02:00
Matt Mackall
e5ce68c388 Merge with crew 2006-10-11 17:37:48 -05:00
Benoit Boissinot
c5ef21b682 merge with crew 2006-10-11 23:31:05 +02:00
Matt Mackall
3d4c9ff34c make manifest-merging test reproduceable 2006-10-11 15:52:08 -05:00
Brendan Cully
1931dc410c Test case for bdiff on buffer objects 2006-10-11 12:02:06 -07:00
Benoit Boissinot
394e9d8946 merge with crew 2006-10-11 16:41:52 +02:00
Benoit Boissinot
cec92b2bd7 fix traceback of extdiff after a merge 
- files that comes from a different branch are marked as modified
  but aren't present in the original manifest
- add a testcase for extdiff and for regular diff
 2006-10-11 16:35:09 +02:00
Alexis S. L. Carvalho
3eeaf02465 update ui.quiet/verbose/debug/interactive every time the config changes 
- ui.quiet/verbose/debug/interactive become just a cache of the ui.cdata
  settings

- the quiet, verbose, debug and interactive options from the [ui] section
  from .hg/hgrc files are respected for commands that open the repo

- setting ui.quiet/verbose/debug/interactive with --config works

- the command line options always override the hgrc settings - previously
  it wasn't possible to override a [ui] debug = True.  --debug still
  takes precedence over --quiet and --verbose.
 2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
105915ca0d ui.py: untangle updateopts 
The code in ui.updateopts that handles ui.quiet, ui.verbose and
ui.debugflag is too smart, making it somewhat hard to see what
are the exact constraints placed on the values of these variables,
hiding some buglets.

This patch makes these constraints more explicit, fixing these
buglets and changing the behaviour slightly.  It also adds a test
to make sure things work as expected in the future.

The buglets:
- setting ui.debug = True in a hgrc wouldn't turn on verbose mode
- additionally, setting ui.quiet = True or using --quiet would give
  you a "quiet debug" mode.

The behaviour change:
- previously, in a hgrc file, ui.quiet wins against ui.verbose (i.e.
  the final result would be quiet mode), but --verbose wins against
  --quiet
- now ui.quiet nullifies ui.verbose and --verbose nullifies --quiet.
  As a consequence, using -qv always gives you normal mode (unless
  debug mode was turned on somewhere)
 2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
561830e0aa call ui.updateopts only after changing directories 
This corrects --config paths.foo=bar when it's used with --cwd
 2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
0cc9fd2297 move the parsing of --config options to commands.py 2006-10-10 18:43:20 -03:00
Giorgos Keramidas
b10311c5e9 Revert changeset d48690da3368. 
It breaks 'hg merge && hg up -c REV' when files exist only in one of the
manifests, making hg throw a traceback like:
 2006-10-10 21:03:24 +03:00
Thomas Arendsen Hein
f8cc3a01a4 merge with upstream 2006-10-10 09:30:05 +02:00
Matt Mackall
2e860ba70d merge: various tidying 
update tests to handle corrected output and new workingctx display
 2006-10-10 02:15:20 -05:00
Matt Mackall
41f0942fa0 merge: shortcircuit filemerge for identical files 
- use filectx.cmp to compare files
- move merge messages into filemerge
- kill the redundant resolving message
- update tests
 2006-10-10 01:16:06 -05:00
Matt Mackall
8df16edc62 merge: unify merge and copy actions 2006-10-10 00:41:55 -05:00
Matt Mackall
6feb12faa2 run-tests: add --first switch to exit on first error 2006-10-09 23:08:41 -05:00
Matt Mackall
a11adc1f86 run-tests: add --retest switch 
-r reruns tests for which a .err file exists
 2006-10-09 23:05:11 -05:00
Matt Mackall
3acfbeaf4c filemerge: use contexts rather than my and other 2006-10-09 21:27:04 -05:00
Benoit Boissinot
fcd9413e54 extend test-flags 2006-10-09 21:48:44 +02:00
Benoit Boissinot
d88c9ddfaa merge with upstream 2006-10-09 21:22:55 +02:00
Matt Mackall
88a9662e9f commit: unify file-level commit code 2006-10-09 14:02:01 -05:00
Benoit Boissinot
fe21c046a7 merge with crew 2006-10-09 15:52:37 +02:00
Benoit Boissinot
77ff96f054 bundle --base: use the right set for the base 2006-10-09 15:44:20 +02:00
Matt Mackall
ddd540c49d merge: remember rename copies and parents properly on commit 
record copies in dirstate even if rename was remote
  this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
 2006-10-08 19:57:45 -05:00
Alexis S. L. Carvalho
c10901518c fix bash completion of debug commands; add test for debugcomplete 
The debugconfig -> showconfig renaming broke things.
 2006-10-08 20:27:23 -03:00
Thomas Arendsen Hein
3eba465a03 merge with upstream 2006-10-08 10:55:11 +02:00
Matt Mackall
c60f9a48ec Fix undetected change bug in rename tests 2006-10-07 17:30:26 -05:00
Thomas Arendsen Hein
eda6c4fc83 Make test-bundle-r executable. 2006-10-07 18:14:03 +02:00
Matt Mackall
f0d4af67fe Update test output 2006-10-06 17:14:50 -05:00
Matt Mackall
447f49c02a Merge with crew 2006-10-06 17:14:18 -05:00
Matt Mackall
718de207ba merge: copy fixes and tests 
Fix up "already seen" logic
Fix merge action in remote copy case
Add status message
Add lots of merge+copy/move test cases
 2006-10-06 16:55:11 -05:00
Benoit Boissinot
3a1d29d975 ssh: make the error message more clear, add a testcase 2006-10-06 16:24:14 +02:00
Thomas Arendsen Hein
1b2caf3f19 Un-debugify debugconfig to showconfig. (issue 317) 2006-10-05 15:51:54 +02:00
Thomas Arendsen Hein
739335e4b5 merge with upstream 2006-10-05 10:07:40 +02:00
Matt Mackall
81e539f559 merge: fixes for merge+rename 
findcopies: ignore files renamed on both branches
applyupdates: change remove flag to move
recordupdates: record copy actions, including local moves and deletions
 2006-10-04 19:08:04 -05:00
Brendan Cully
de0df5a89b Merge with upstream 2006-10-03 12:14:33 -07:00
Jose M. Prieto
7670d11c8a Add documentation about the date formats allowed in the command line 2006-10-03 12:33:22 +02:00
Jose M. Prieto
a76c2de547 util.strdate: assume local time when no timezone specified 2006-10-03 12:33:18 +02:00
Jose M. Prieto
06cffb7de4 util.strdate: compute timestamp using UTC, not local timezone 2006-10-03 12:33:14 +02:00
Benoit Boissinot
eeb30a5065 [extendedchangelog] encode/decode function 
encode '\n', '\r' and '\0'
 2006-10-02 22:35:37 +02:00
Matt Mackall
a9124fdfed merge: extend file merge function for renames 2006-10-02 12:04:48 -05:00
Benoit Boissinot
f8998cc29f merge with crew 2006-10-02 08:40:26 +02:00
Benoit Boissinot
02c099067f test-merge-revert2 solaris fix 2006-10-02 08:36:29 +02:00
Thomas Arendsen Hein
0a7b982aa6 Whitespace/Tab cleanup 2006-10-01 19:26:33 +02:00
Thomas Arendsen Hein
5110ed5266 Merge with upstream 2006-09-30 09:46:03 +02:00
Thomas Arendsen Hein
bdf79a5c6d Remove unneeded (and bashismic) export HGMERGE=true. 2006-09-30 09:39:44 +02:00
Matt Mackall
72659a3964 merge: use repo.parents and parent contexts in update 2006-09-29 16:39:38 -05:00
Stephen Darnell
87280e847b Remove single character equivalent of --nodates (was -D) 2006-09-28 21:00:01 +01:00
Stephen Darnell
a808384cf1 Add -D/--nodates options to hg diff/export that removes dates from diff headers 
and replace uses of sed in the tests with --nodates.
 2006-09-26 00:05:24 +01:00
Brendan Cully
d1c28696d4 Show copies in hg log. 
The format is:
copies: destination (source)...
 2006-09-29 13:01:19 -07:00
Thomas Arendsen Hein
1803d363c7 Make "hg log --style=changelog > changelog" work (issue338) 
Style files in templates/ now take precedence over current directory.
This can be overridden with --style=./changelog if really neeeded.
Added test for issue338.
 2006-09-29 21:24:15 +02:00
Thomas Arendsen Hein
d3fc1dadc1 Documentation fixes for addremove. 
- It is no longer deprecated, but the short help still included (DEPRECATED).
- Similarity parameter has to be 0<=s<=100 and not 0<=s<=1.
 2006-09-27 21:43:45 +02:00
Brendan Cully
2946d7faed Refactor annotate copy support. 2006-09-27 09:10:21 -07:00
Matt Mackall
235ebaa809 Add core copy detection algorithm 
This adds findcopies, which detects merge-relevant copies between
files in a pair of manifests back to the merge ancestor.

While the merge code invokes the copy detection routine, it does not
yet use the result.
 2006-09-25 16:45:31 -05:00
Giorgos Keramidas
c6538e557f tests: add new test; test-mq-qrefresh 2006-09-20 21:44:35 +02:00
Matt Mackall
885b6f1a23 merge: simplify actions with helper function 2006-09-17 21:27:30 -05:00
Matt Mackall
56ee773f9b merge: simplify local created logic 2006-09-17 21:11:26 -05:00
Matt Mackall
769045bfdc merge: remove linear variable 2006-09-17 17:13:02 -05:00
Matt Mackall
d031f12c1d Merge with backout 2006-09-15 16:01:16 -05:00
Matt Mackall
277fde1fea Back out trusted hgrc change for now 
Backed out changeset f077d29b114d4
 2006-09-15 16:00:16 -05:00
Matt Mackall
3f3298dd8d Merge with crew 2006-09-15 15:22:45 -05:00
Brendan Cully
2af71f83a1 cat: default to working dir parent instead of tip 
This introduces a defaultrev function that chooses
the working dir parent if a revision isn't specified,
and uses it in several places.
 2006-09-14 19:24:00 -07:00
Brendan Cully
6222780283 mq: add qdelete --forget option 
This removes an applied patch from the series and status files without
popping it. It is useful when an mq patch has been applied upstream.
 2006-09-14 15:35:55 +02:00
Benoit Boissinot
2baab981fb sshrepo: don't try to validate when creating the repo 
- This removes the "repo not found" error when cloning or init-ing a remote
  repo.
- Since the remote hg will abort if the repo already exists we don't need to
  validate it.
 2006-09-13 19:57:40 +02:00
Brendan Cully
5ee5b4abae Make qrename handle directory targets; closes #333. 2006-09-13 08:57:08 -07:00
Thomas Arendsen Hein
1cff09d393 Added tests for qpush/qpop with index. 2006-09-12 17:26:20 +02:00
Thomas Arendsen Hein
978cbf5cbd Fixed OSError "No such file or directory: None" and make IOError consistent. 
The None error occurs when the current working directory is no longer
available, e.g. because it was removed in another shell.
 2006-09-11 10:23:23 +02:00
Thomas Arendsen Hein
005fbb4e58 Include section name and parameter name (if available) in config errors. 
Added tests for this.
 2006-09-08 10:01:45 +02:00
Benoit Boissinot
2ea82386bd hg merge: fix lookup of branch 
add some tests for branch usage
 2006-09-08 02:16:16 +02:00
Benoit Boissinot
670858c395 git --diff: fix traceback when getting mode change 
- use the manifest instead of the mode in the working dir
  if the diff is against two revisions
- add a testcase
 2006-09-07 14:12:39 +02:00
Matt Mackall
9ee666d233 merge: use context code to retrieve manifests 2006-08-22 19:32:16 -05:00
Alexis S. L. Carvalho
fa133e9e4f Only read .hg/hgrc files from trusted users/groups 
The list of trusted users and groups is specified in the [trusted]
section of a hgrc; the current user is always trusted; "*" can be
used to trust all users/groups.

Global hgrc files are always read.

On Windows (and other systems that don't have the pwd and grp modules),
all .hg/hgrc files are read.
 2006-08-22 20:45:03 -03:00
Matt Mackall
b3f3e7896e merge: combine merge and get lists 2006-08-22 18:06:17 -05:00
Vadim Gelfer
9e5bd16634 merge. 2006-08-23 08:42:21 -07:00
Matt Mackall
656a5f8eb1 merge: simplify working dir manifest generation 2006-08-22 17:08:38 -05:00
Thomas Arendsen Hein
acc2d17e2f Make test-strict append to $HGRCPATH, like other tests do since e6e7d87cb388. 2006-08-22 10:20:21 +02:00
Thomas Arendsen Hein
dd369da4a5 Merge with tah 2006-08-22 10:18:40 +02:00
Thomas Arendsen Hein
a1f1b33ecb Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc 
and add documentation for this.
 2006-08-22 10:08:42 +02:00
Thomas Arendsen Hein
31b1fbbac8 Clear contents of global hgrc for tests before running each test. 
This fixes running test-mq-qdiff after test-mq, because of changed settings.
 2006-08-22 09:55:14 +02:00
Bryan O'Sullivan
24286794a7 Add ui.strict config item. 
This turns off command matching by unambiguous prefix, and is a good
thing if you want to write future-proof scripts.

This fixes issue 314.
 2006-08-21 21:59:29 -07:00
Lee Cantey
2e459ed1d8 Allow for MB/sec transfer rates in test-http 2006-08-21 16:33:43 -07:00
Danek Duvall
3dfcc70c3e patch queue: portability.notes 2006-08-21 14:13:27 -07:00
Vadim Gelfer
38dd424903 revert: require --all to revert all files. 2006-08-21 09:44:52 -07:00
Matt Mackall
4e0e3a1e78 tag: shorten hash in default commit message 
Move default message to commands.py
Pass node in binary for consistency
Remove default arguments
Fix up tests
 2006-08-20 23:52:52 -05:00
Matt Mackall
ba56a1fdbd Only show long hashes with --debug, not --verbose 2006-08-20 22:51:56 -05:00
Vadim Gelfer
f72ee79e69 addremove: add -s/--similarity option 
progress on issue 295.
 2006-08-18 22:13:58 -07:00
Vadim Gelfer
5a993ee589 merge. 2006-08-18 21:17:28 -07:00
Vadim Gelfer
853998bf60 fix issue 322. 
do not allow to add files that shadow files or directories already in dirstate.
 2006-08-18 21:03:29 -07:00
Vadim Gelfer
feeb6e59eb add other dir/file case to test for issue322. 2006-08-18 15:53:14 -07:00
Vadim Gelfer
dfb60a287c add test for issue 322. 
no .out file because issue is still live.
 2006-08-18 14:49:12 -07:00
Vadim Gelfer
a7a2bb9df7 merge with brendan. 2006-08-18 13:01:40 -07:00
Danek Duvall
c6b9a108d2 Solaris portability fixes 2006-08-18 10:24:04 -07:00
Brendan Cully
f814ae9ab3 sed portability fixes 2006-08-16 19:50:21 -07:00
Brendan Cully
16fb95a415 Teach mq about git patches 2006-08-16 19:49:45 -07:00
Vadim Gelfer
3cd0a9298f make new tests executable. 2006-08-16 10:53:01 -07:00
Giorgos Keramidas
8b8d11fe4e tests: new test for the bisect extension 2006-08-15 21:49:49 +03:00
Giorgos Keramidas
1c8f75d525 tests: new test for "hg annotate" 2006-08-15 21:22:26 +03:00
Brendan Cully
2709262462 Unify mq and hg patch invocation. 
This makes patch a little less verbose by default, so the tests
had to be updated.
 2006-08-15 11:28:50 -07:00
Vadim Gelfer
a4297a2ce3 merge. 2006-08-15 11:43:31 -07:00
Vadim Gelfer
f9cef8451f make test-mq-qdiff executable. 2006-08-15 11:42:50 -07:00
Vadim Gelfer
efefb2e2cb merge with other head by default, not tip. 
fixes issue 339.
 2006-08-15 11:38:07 -07:00
Giorgos Keramidas
6263e5e98b tests: new test for mq qdiff command 
`hg qdiff .' is supposed to work but it is currently broken.
This test should help us verify when it gets fixed.
 2006-08-15 20:59:55 +03:00
Thomas Arendsen Hein
d4d1d2313a Fixed test-extdiff. 
diff-like tools usually return 1 if differences are found.
Currently the extdiff returns 256, but that's a different topic
(consolidating return code handling in hg).
 2006-08-15 16:04:47 +02:00
Thomas Arendsen Hein
f7a86f8d81 Adjusted test to changed help output. 2006-08-15 11:47:17 +02:00
Brendan Cully
c18265f47c Add diff --git option 2006-08-14 22:48:03 -07:00
Vadim Gelfer
ad47ec66c1 extdiff: fix bugs. add test. 2006-08-14 15:51:35 -07:00
Brendan Cully
44847fbcba Test for log --prune. 2006-08-14 10:27:02 -07:00
Vadim Gelfer
cc643dbb24 make test-diff-subdir executable. 2006-08-13 15:03:48 -07:00
Giorgos Keramidas
cbaa061404 tests: new test for hg diff of a subdirectory only 2006-08-13 23:00:18 +03:00
Vadim Gelfer
00af865078 merge. 2006-08-12 15:43:38 -07:00
Brendan Cully
3d708cb539 grep: add --follow support. 2006-08-12 15:01:46 -07:00
Brendan Cully
3b28d277f1 grep: display correct user/revision for --all in reverse. 
Also handle multiple occurrences of the same line by storing
linestates in an array instead of a dict, and using difflib
to compute the difference between linestates.
 2006-08-12 13:51:14 -07:00
Brendan Cully
8ebc2ba929 Tests for git import 2006-08-11 16:56:31 -07:00
Vadim Gelfer
c21702b07b fix test output 2006-08-10 17:37:57 -07:00
Vadim Gelfer
cefae5007c mq: apply patch is any posative guard matches 
this is like guards command from quilt package.
 2006-08-10 17:18:55 -07:00
Vadim Gelfer
375ed90afa mq: do not allow to push from repo with patches applied 2006-08-10 16:10:59 -07:00
Vadim Gelfer
4bb52754b3 mq: test commit in repo with patches applied 2006-08-10 15:02:18 -07:00
Vadim Gelfer
65c989bccf qselect: add --pop, --reapply options 2006-08-10 14:58:10 -07:00
Danek Duvall
9c364cbd6e Fix some tests for portability. 2006-08-09 12:05:40 -07:00
Matt Mackall
76c5adea2f Merge with crew, fix most tests 2006-08-09 13:55:18 -05:00
Vadim Gelfer
626fbfdeed mq: make guards more strict, add tests 2006-08-09 09:38:11 -07:00
Vadim Gelfer
594d062505 mq: drop qversion command 2006-08-08 17:11:36 -07:00
Vadim Gelfer
3a361df8d7 tests: forgot to add test-mq-guards.out 2006-08-09 02:04:49 -07:00
Vadim Gelfer
e946d15d30 test-fetch: make output stable 2006-08-08 16:23:02 -07:00
Vadim Gelfer
9b3aa8dfc1 fetch: fix breakage from mpm. 
add test so will not break again.
 2006-08-08 16:09:26 -07:00
Vadim Gelfer
3ea890331f mq: new commands qselect, qguard 
implement quilt-style guards for mq.

guards allow to control whether patch can be pushed.

if guard X is active and patch is guarded by +X (called "posative guard"),
patch can be pushed.  if patch is guarded by -X (called "nagative guard"),
patch cannot be pushed and is skipped.

use qguard to set/list guards on patches.  use qselect to set/list
active guards.

also "qseries -v" prints guarded patches with "G" now.
 2006-08-08 21:42:50 -07:00
Vadim Gelfer
f2173a1253 fix permission of test-mq-qsave 2006-08-08 18:14:03 -07:00
Matt Mackall
de047b03ce Introduce update helper functions: update, merge, clean, and revert 2006-08-07 22:54:33 -05:00
Brendan Cully
e4b5636d59 Add basic qsave/qrestore test. 2006-08-07 14:48:24 -07:00
Vadim Gelfer
8b999d6f47 merge with self. 2006-08-04 10:38:17 -07:00
Vadim Gelfer
f34bef85ce fix output of test-backout. 2006-08-04 10:37:40 -07:00
Brendan Cully
956d0c4e17 Test suite for log --follow and --follow-first. 2006-08-03 15:12:15 -07:00
Mathieu Clabaut ext:(%22)
dced35893a Import say a file is not tracked after patching : test case 2006-08-02 09:29:17 +02:00
Vadim Gelfer
45763df4fc tests: fix output for test-backout 2006-08-02 13:04:36 -07:00
Vadim Gelfer
fb083c6317 fix mq test output. 2006-08-01 15:40:54 -07:00
Brendan Cully
7750dbbb50 New self-explanatory command qrename. 2006-08-01 10:55:06 -07:00