facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 00:45:18 +03:00
Code Issues Projects Releases Wiki Activity
7,841 Commits 24 Branches 62 Tags 323 MiB
68f6893175
Commit Graph

2113 Commits

Author SHA1 Message Date
Mads Kiilerich
6e4fb4100f tests: Skip tests if they will fail because of outer repo 
For different reasons these tests will fail if run in a tmpdir which is in a hg
repo.

The following three tests assumes no .hg in path dirs - I don't know how to
work around that:

* test-dispatch explicitly tests for no repo and expects "abort: There is no
Mercurial repository here (.hg not found)!"

* test-extension expects parentui to be None when not cd'ed to a repo dir

* test-globalopts tests that implicit -R works correctly - that could perhaps be
done from another repo instead of assuming no repo

The following two might be worth investigating further:

* test-convert-svn-sink fails for unknown reasons, starting with "abort:
unresolved merge conflicts (see hg resolve)"

* test-glog gets strange failures when testing "from outer space"
 2008-11-27 00:57:31 +01:00
Mads Kiilerich
46204606ec tests: use killdaemons in hgweb tests 
hgweb tests often failed on my system because the serve port wasn't free when a
new hgweb was started; the killed hg wasn't completely dead yet.

Now we use killdaemons which waits for the process to die.
 2008-11-27 00:57:30 +01:00
Benoit Boissinot
22d9484189 Catch both IOError and OSError, fix regression introduced by 0018648194a9 2008-11-26 18:23:35 +01:00
Benoit Boissinot
ea0e021c3d protocol: use changegroupsubset() if possible (issue1389) 
Due to the fix to the pull race, to avoid sending unnecessary
changesets, use changegroupsubset if possible.
This will increase the load on the server.
 2008-11-25 23:26:33 +01:00
Matt Mackall
c163f654f6 Merge with crew 2008-11-25 16:24:22 -06:00
Benoit Allard
f0e30bc7e3 email: add References field in the header 
This hopefully helps clients get the threading right.
 2008-11-25 23:13:14 +01:00
Dirkjan Ochtman
6aedc8f323 coal/paper: link to shortlog instead of log from error pages 2008-11-25 22:52:25 +01:00
Dirkjan Ochtman
50396f781f coal/paper: show branch name in changeset view 2008-11-25 22:53:01 +01:00
Benoit Allard
f1183e9953 coal/paper: display branch names in log 2008-11-25 22:51:10 +01:00
Brendan Cully
99c25ba716 Improved error message for log --follow 
Mads Kiilerich notes that the existing message was unclear
when a nonexistent file was supplied.
 2008-11-24 17:16:39 -08:00
Brendan Cully
aad17924e9 import: add similarity option (issue295) 2008-11-22 00:21:57 -08:00
Brendan Cully
63fa2faa43 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) 2008-11-23 00:44:31 -08:00
Mads Kiilerich
b0e14a3f2e tests: disable test-convert-darcs properly for darcs 2 
The x bit was disabled without notice in 0018648194a9
 2008-11-23 20:16:29 +01:00
Matt Mackall
4e3875be62 update help on git diffs 2008-11-18 15:35:34 -06:00
Peter Arrenbrecht
f5e17bf442 graphlog: fix regression with filelogs introduced by c19a6e3c8257 2008-11-16 20:55:30 +01:00
Patrick Mezard
9abae0a381 test-pull-branch: make it executable 2008-11-15 15:09:11 +01:00
Benoit Allard
7fb31ff7cc pull: update to branch tip if there is only one head on the current branch 
On pull, if the current named branch has only one head, update to it.
 2008-11-14 14:36:17 +01:00
Chris Winter
454f5f9dca patchbomb: add option to send intro email for a single patch (issue1120) 2008-11-13 10:11:32 +01:00
Peter Arrenbrecht
e9db68caeb patchbomb: fix patch name generation in patch series 2008-11-12 19:12:32 +01:00
Peter Arrenbrecht
1e542b2102 patchbomb: add tests for diffstat, inline, and attach options 2008-11-12 19:12:26 +01:00
Peter Arrenbrecht
4cbd9181b8 patchbomb: make test markers more syntax highlighter friendly 2008-11-12 19:12:21 +01:00
Benoit Boissinot
f30c45529e Backed out changeset 131da9defd10 (issue1375) 2008-11-12 09:08:43 +01:00
Benoit Boissinot
e2636d353e inotify: fix replacing a folder with a file (issue1375) 2008-11-11 23:16:59 +01:00
Benoit Boissinot
331010693d fix test-export portability (issue1383) 
wc outputs with leading spaces on *BSD
 2008-11-09 12:15:32 +01:00
Dirkjan Ochtman
2b37453255 merge with mpm 2008-11-08 00:29:04 +01:00
Dirkjan Ochtman
12d40d8733 tests: fix test failures from default/template changes 2008-11-08 00:27:51 +01:00
Dirkjan Ochtman
1763cebde5 tests: make killdaemons.py executable 2008-11-07 23:56:02 +01:00
Dirkjan Ochtman
f8d7226e5f hgweb: fix up the less/more links on the graph page 
Previously, they pointed to a non-intuitive revision, and got borked when
using a URL-specified style combined with alternate revcounts.
 2008-11-07 23:31:12 +01:00
Matt Mackall
eed64a7674 tests: add killdaemons helper script 2008-11-07 16:28:53 -06:00
Matt Mackall
0edb7d6fe4 run-tests: allow turning off diff display 2008-11-07 16:28:52 -06:00
Dirkjan Ochtman
4c1b1ea66e tests: fix tests broken by c216b7812bf2 2008-11-22 16:57:49 +01:00
Brendan Cully
5a88518d14 inotify: fix status . in repo.root 2008-11-19 13:00:48 -08:00
Matt Mackall
ada0793b5a tests: fix test-hgweb to not leak directory name 2008-11-06 13:15:35 -06:00
Matt Mackall
eef50022da hgweb: update tests for paper style 
diff -r ca03debb3dcd -r 4e1e6aee37e8 tests/test-hgweb-commands.out
Binary file tests/test-hgweb-commands.out has changed
 2008-11-06 12:22:09 -06:00
Dirkjan Ochtman
076e8caeee hgweb: show revision number in the graph pagination 2008-11-07 15:47:01 +01:00
Thomas Arendsen Hein
aaf6b3ebf3 Fix test output for updated gitdiffs help and web template cleanups 2008-11-07 13:08:34 +01:00
Peter Arrenbrecht
63d1bb911f ui: log non-interactive default response to stdout when verbose 
This allows test scripts that feed their output into documentation
to properly show the session as it would appear to an end-user.
 2008-11-07 10:27:39 +01:00
Ronny Pfannschmidt
599e773be7 export: fixed silent output file overwriting 
hg export -o outfile 1 2 3 4 had the same effect as hg -o outfile 4

This was caused by opening with 'w' instead of 'a'. This only occurs when
the filename pattern resulted in ambiguous patch filenames.
 2008-11-06 11:17:38 +01:00
Benoit Boissinot
6cfe681282 merge bookmarks 2008-11-06 10:39:52 +01:00
Alexander Solovyov
a061b66a79 bookmarks: Test if rebase works with bookmarks 
Add a test that tests if rebase works fine with bookmarks.
 2008-11-06 10:31:09 +01:00
Dirkjan Ochtman
88ca4ce332 tests: run svn tests only with svn bindings >1.3 2008-11-05 18:57:54 +01:00
David Soria Parra
d23187bf3d bookmarks: Use dirstate to determine the current node in addchangegroup 
Using the changectx might result in a lookup error during the strip command.
Thefore we use the current dirstate to get the parents of the working directory.
 2008-11-05 03:53:34 +01:00
Matt Mackall
43ed73b993 Shorten sleep in inotify test 2008-11-03 16:01:24 -06:00
Dirkjan Ochtman
5e743c6696 hgweb: move the diffs() generator into webutil 2008-11-03 20:41:48 +01:00
Dirkjan Ochtman
17464b3066 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258) 
This gets us git diffs when enabled and doesn't pick erratic file parents.
 2008-11-03 20:05:03 +01:00
Dirkjan Ochtman
4af26a1f84 help: commands supporting --git point to the gitdiffs topic (issue1352) 2008-11-03 16:31:47 +01:00
Ry4an Brase
555314efe8 hgweb: descend empty directories in web view 
When a manifest has a series of directories with nothing in them but a single
directory, displaying the entire chain of empty directories allows for
navigation down to the first non-empty directory with a single click.

Because Java links package hierarchy to directory hierarchy, and because Java
conventions include at least three empty directories at the top of this
hierarchy, descending down empty directories is very common in Java web tools.
 2008-11-03 10:20:28 +01:00
Gerard Korsten
069ac42a71 inotify: server raising an error when removing a file (issue1371) 
When a file is deleted via hg rm <file> the dirstate marks the file with a
status of 'r'. The physical file has been deleted, but the inotify server
tries to do a stat on the file after it's been removed.

Patch catches the exception and correctly call updatestatus()
 2008-11-01 14:05:13 +02:00
Dirkjan Ochtman
1450b6c29e hgweb: conditionally show file logs for deleted files 2008-11-01 13:07:24 +01:00
Brendan Cully
05dded9051 mq: use cmdutil.matchfiles instead of match for qnew -f. 
Closes issue1368.
 2008-10-30 12:38:24 -07:00
Brendan Cully
636630e1d2 mq: put qnew tests into own file, fold in qnew-twice 2008-10-30 12:31:24 -07:00
Dirkjan Ochtman
4a5e2178e2 help: add a topic on git diffs (issue1352) 2008-10-30 08:21:20 +01:00
Adrian Buehlmann
1711588dff add test-fncache 2008-10-29 13:37:35 +01:00
Stefano Tortarolo
9061d953b4 rebase: avoid redundant merges (issue1301) 2008-09-16 17:51:14 +02:00
Adrian Buehlmann
c550091c36 add new test-hybridencode.py 2008-10-27 19:39:41 +01:00
Benoit Boissinot
6d87d8209c '\' should be escaped twice, for the shell, and for tr 2008-10-28 08:18:11 +01:00
Benoit Boissinot
b16c2d675b merge with crew 2008-10-28 00:03:28 +01:00
Patrick Mezard
40e1027bce test-http-proxy: hide logged URL port number, works with--jobs 2008-10-27 23:47:17 +01:00
Benoit Boissinot
311e4870b2 use our urlopener (proxy handling, etc) instead of urllib 2008-10-27 21:50:16 +01:00
Benoit Boissinot
cd80319bc5 httprepo: factor out proxy handling 2008-10-27 17:48:05 +01:00
Benoit Boissinot
facb3df783 test-http-proxy: print the log from the proxy 2008-10-27 17:37:37 +01:00
Benoit Boissinot
1af2a5203a merge with dsop 2008-10-27 13:52:55 +01:00
Adrian Buehlmann
836ce2131c test-init: add test with format.usefncache=false 2008-10-27 13:22:45 +01:00
Benoit Boissinot
7c4c2ad96b merge with crew 2008-10-27 13:17:26 +01:00
Patrick Mezard
ef4d9a9d32 patch: fix patched files records in externalpatcher() 2008-10-26 17:26:28 +01:00
Joel Rosdahl
0cbdb6d6f6 bookmarks: Add tests 2008-10-25 19:05:52 +02:00
Patrick Mezard
bad493a8fd test-mq-qimport: fix URL generation under windows 2008-10-25 13:24:14 +02:00
Patrick Mezard
7985f2f92e test-patchbomb: write in binary mode, force non-interactive mode (win32) 2008-10-27 22:07:39 +01:00
Thomas Arendsen Hein
912f59bb30 Remove trailing spaces. 2008-10-24 15:00:40 +02:00
Christian Ebert
b218f8d45e test 8abe3f27975c: grep w/ match in last line w/o newline 
Last character in match output omitted to avoid infinite loop.
 2008-10-24 08:16:01 +02:00
Benoit Boissinot
4f2e35bc33 fix pull racing with push/commit (issue1320) 
changegroup() has a problem when nodes which does not descend from a node
in <bases> are added to remote after the discovery phase.
If that happens, changegroup() won't send the correct set of nodes, ie.
some nodes will be missing.
To correct it we have to find the set of nodes that both remote and self
have (called <common>), and send all the nodes not in <common>.

This fix has some overhead, in the worst case it will re-send a whole branch.

A proper fix to avoid this overhead might be to change the protocol so that
the <common> nodes are sent (instead of the <bases> of the missing nodes).
 2008-10-21 17:00:35 +02:00
Patrick Mezard
a90ccace70 convert: correctly detect missing revlog for root revisions 2008-10-23 23:03:09 +02:00
Patrick Mezard
f10fc4ae24 convert: ignore hg source errors with hg.ignoreerrors (issue 1357) 
This flag makes missing revlog errors to be ignored which allow broken
repositories to be fixed by converting them from and to Mercurial.
 2008-10-21 21:24:47 +02:00
Adrian Buehlmann
f3f0f9ecd6 introduce fncache repository layout 
* adds a new entry 'fncache' to '.hg/requires' for new repos
* writes new file '.hg/store/fncache'
* hash-encodes filenames with long paths (issue839)
* encodes Windows reserved filenames (issue793)
 2008-10-19 19:12:07 +02:00
Mads Kiilerich
156ce431aa Make it possible to disable filtering for a pattern. 
Rationale: Apparently there were no way to disable for example win32text extension locally.

RFC: Can it already be done another way?
 2008-10-14 21:28:49 +02:00
Patrick Mezard
f93bdf76d1 Merge with crew-stable 2008-10-23 15:44:23 +02:00
Patrick Mezard
54f7c66fa0 convert: read git output in binary mode under Windows (issue 1359) 2008-10-23 14:05:11 +02:00
Matt Mackall
38344e11c6 inotify: auto-start by default when enabled 2008-10-22 19:40:29 -05:00
Matt Mackall
3c69f4c760 run-tests: --interactive overrides -j 2008-10-22 17:34:37 -05:00
Matt Mackall
e617903e64 Autodetect static-http 2008-10-22 15:41:32 -05:00
Matt Mackall
ee921a6080 help: update help 
make help description 'topic'-oriented rather than 'command'-oriented
change 'special' to 'additional'
 2008-10-22 14:30:34 -05:00
Benoit Boissinot
97977f767e tests: log and show errors 2008-10-22 21:39:56 +02:00
Dirkjan Ochtman
adb2a35499 tests: add more testing for webdir nesting 2008-10-22 18:32:17 +02:00
Benoit Allard
31ab3aeaed hgwebdir: show nested repositories (issue1336) 2008-10-22 18:23:32 +02:00
Dirkjan Ochtman
896a6939aa help: show extension commands in short list, separate extension list in help 
In 'hg', we now show a short list of commands, including extension commands.
In 'hg help', we show core commands, a list of enabled extensions, and topics.
 2008-10-21 11:29:27 +02:00
Thomas Arendsen Hein
614711f636 merge with crew 2008-10-20 18:29:44 +02:00
Christian Ebert
576714b48a mail: test patch mime encoding for patchbomb 2008-10-20 17:40:29 +02:00
Dirkjan Ochtman
f5ea74b223 clean up trailing spaces, leading spaces in C 2008-10-20 14:57:04 +02:00
Dirkjan Ochtman
664ef048a7 merge with crew-stable 2008-10-20 14:52:58 +02:00
Dirkjan Ochtman
e085823cf1 clean up trailing spaces 2008-10-20 14:51:55 +02:00
Dirkjan Ochtman
cc867a892e hgweb: working diff for removed files 2008-10-20 14:13:37 +02:00
Mads Kiilerich
905ce16584 mq: Fix --qrefresh --short to work with --exclude and --include 
pmezard expects
	hg qref -s -X b
to apply the -X to the list of files in the patch, and thus remove b from the
patch.
That's how it worked before c302ef4372b2. That change seemed sensible, but it
wasn't...

mpm says
	(17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ?
	(17:22:54) pmezard_: kiilerix1: and --include too
	(17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar
so mpm expects
	hg qref -s -X b *
to apply the -X to the list of files in the working directory, and thus don't
include b in the patch

This patch tries to make both usecases work by creating a matchfn which uses
the include/excludes but not the filelist.
 2008-10-19 16:31:24 +02:00
Thomas Arendsen Hein
1493b09823 Merge with crew 2008-10-19 19:10:26 +02:00
Thomas Arendsen Hein
d6b1ca4cb9 Use dummy diffstat in tests and remove older diffstat workaround. 
This makes test-notify pass on systems without diffstat installed
or where the diffstat version yields a different output.
 2008-10-19 19:03:23 +02:00
Thomas Arendsen Hein
c740f7ded2 Fix test-bundle-type output by changing head|cut to cut|head. 
With some versions of cut the output otherwise has no end of line.
 2008-10-19 17:40:35 +02:00
Thomas Arendsen Hein
0bafe8661c convert documentation: --config argument with spaces needs quoting. 2008-10-19 15:24:33 +02:00
Benoit Boissinot
33a3a545ff merge with crew 2008-10-19 13:00:36 +02:00
Thomas Arendsen Hein
68521aa75e Fix test-notify output for older diffstat versions. 2008-10-19 12:34:34 +02:00
Benoit Boissinot
980f1548c1 hgweb: nodeids should be aligned in raw changesets 
If they aren't it breaks hg import --exact
Thanks to Jesper Noehr for noticing it.
 2008-10-19 12:23:58 +02:00
Brendan Cully
c935fe6e01 mq: abort qnew -f if any file in an explicit list cannot be read 2008-10-18 20:45:53 -07:00
Brendan Cully
eeb6237595 mq: make qimport -f work properly. Closes issue1255. 
From Bernhard Leiner.
 2008-10-18 17:29:45 -07:00
Brendan Cully
a52b846f5d Merge with crew 2008-10-18 16:53:44 -07:00
Brendan Cully
08cb02aa5a mq: let qimport read patches from URLs 2008-10-18 16:40:01 -07:00
Benoit Boissinot
27bcc719e6 add a missing +x to test-inotify-lookup 2008-10-19 01:28:35 +02:00
Benoit Boissinot
56d9a3258b merge with crew 2008-10-18 23:20:23 +02:00
Benoit Boissinot
3babcafb3e inotify: fix status not showing "clean" files (issue907) 
The inotify server uses 'c' for clean, not 'n'.
 2008-10-18 23:06:29 +02:00
Benoit Boissinot
624e32832b run-tests.py: report missing file as an error 2008-10-18 22:44:01 +02:00
Brendan Cully
cc3761c2b3 Merge with crew 2008-10-18 13:22:46 -07:00
Brendan Cully
203e3723e8 Prevent import over an applied patch (closes issue795) 2008-10-18 13:22:29 -07:00
John Mulligan
636223becf issue 1144: prevent traceback on verify of bundles 2008-10-18 14:43:14 -04:00
Benoit Boissinot
44d89759ff run-tests.py: use --prefix instead of --home 
Some SUSE version don't like --home, they fail with:
"error: must supply either home or prefix/exec-prefix -- not both"

this is due to SUSE shipping a distutils.cfg conflicting with --home.
 2008-10-18 21:08:44 +02:00
Benoit Boissinot
4e105a6d69 test-permission: put sane permissions at the end of the test 
If we don't do that, we won't delete all directories at the end of the test
 2008-10-18 20:47:47 +02:00
Dirkjan Ochtman
1830efd60d tests: fix output for test-notify 2008-10-18 18:24:37 +02:00
Stefano Tortarolo
7658d9947c rebase: disable rollback after rebasing 2008-10-18 17:00:28 +02:00
Dirkjan Ochtman
c5e3760e1d help: better documentation intro for a few extensions 2008-10-18 16:56:39 +02:00
Patrick Mezard
910e49f24f test-doctest: remove TERM env variable only if it's there 2008-10-11 16:40:59 +02:00
Patrick Mezard
3eb95e081f convert: properly encode subversion URLs (issue 1224) 2008-10-10 11:36:02 +02:00
Dirkjan Ochtman
fcf19417f1 clone: honor -r even when pulling named branches 2008-09-24 13:10:09 +02:00
Benoit Boissinot
0d1cd8705f Escape '%' when writing to hgrc (issue1199) 
Fixes clone with paths containing '%'.
Patch provided by mjc.
 2008-09-20 15:00:58 +02:00
Dennis Schoen
ed4bd4d0e6 tests: add test for notify extension as changegroup hook 2008-09-18 13:55:58 +02:00
Mads Kiilerich
b80093e190 tests: fix reported patch tool name in test-mq 
Strip any path of the patch executable, which it might return on failure.
 2008-09-18 13:45:36 +02:00
Mads Kiilerich
b0d9bb04f5 tests: fix readline escape characters in output for test-doctest.py 2008-09-18 13:48:41 +02:00
Dirkjan Ochtman
87abdc361c tests: fix test-highlight for compatiblity with newer Pygments 2008-09-17 11:14:06 +02:00
Benoit Boissinot
d6add1b5a8 forbid username with '\n' at the changelog level 
It was already forbidden for ui.username() but no verification were
made for username passed through the commandline.
 2008-09-13 17:46:09 +02:00
Benoit Boissinot
fdb31340ce run-tests.py: fix the check for the hg installation with -jn (n > 1) 2008-09-10 13:52:33 +02:00
Benoit Boissinot
bb6f34eb86 inotify: add client code for long pathname handling 2008-09-07 15:10:11 +02:00
Benoit Boissinot
6600c99d5a inotify: workaround ENAMETOOLONG by using symlinks 
If we can't create the unix socket because the path is too long
we create the socket in a temporary directory and symlink it into
the repo.

Fix issue1208
 2008-09-06 14:11:33 +02:00
Benoit Boissinot
5b0f8d909f inotify: deactivate inotify status on failure 
workaround issue1208, add test
fix traceback handling (socket.error is a singleton in this case)
 2008-09-06 12:49:20 +02:00
Benoit Boissinot
3e99382003 fix test-bisect error (because of set -e) 2008-09-05 11:02:12 +02:00
Dirkjan Ochtman
f785a1c716 bisect: only complain when nothing can be done 2008-09-03 19:00:43 +02:00
Dirkjan Ochtman
8c471ba704 imported patch test-check 2008-09-03 19:01:35 +02:00
Patrick Mezard
a5a7a649cf graphlog: fix calls from outside the repository (issue1285) 2008-09-02 09:25:29 +02:00
Dirkjan Ochtman
83b9ec89ae bisect: status message when no action is specified 2008-08-21 19:02:56 +02:00
Christian Ebert
51ca48048e Make test-hardlinks-safety portable 
On some systems cp cannot create/preserve hardlinks.
Use util.copyfiles instead, after making sure it actually does
create hardlinks.
 2008-08-20 17:58:12 +02:00
Thomas Arendsen Hein
0e5b328695 Adjust test output for hg help qrecord since 0fd032cb1106 2008-08-20 15:04:45 +02:00
Dov Feldstern
7805ceec07 test symlinks on symlink-capable os but non-capable filesystem (issue1149) 
The "real" way to test this is to mount a non-symlink-capable filesystem, and
try working on it; however, I don't know how to mount filesystems as a
non-priveleged user from within the testing framework. So instead, os.symlink
is overridden to raise the exception that would be raised on such a filesystem.
 2008-07-31 22:41:19 +03:00
Matt Mackall
4d074f2f87 add a fix for issue 1175 
If we copy a file followed by an update, it's possible for the parent
manifest to no longer contain the source file of the copy, which could cause
commit to fail. If this happens, we search backwares from the first
parent to find the most likely original revision.
 2008-08-10 18:01:03 -05:00
Thomas Arendsen Hein
67623d98de Make test-convert-mtn pass on systems where mtn add -R uses different order 2008-08-09 11:46:20 +02:00
Thomas Arendsen Hein
d912d56f04 Make test-hardlinks-safety repeatable and executable 2008-08-08 18:48:26 +02:00
Bernhard Leiner
12387fffd4 add additional bisect tests 2008-08-02 22:10:54 +02:00
Bernhard Leiner
41c8918f2f add additional complex bisect tests (with non-linear history) 2008-08-02 22:11:22 +02:00
Patrick Mezard
c717caba48 Fix subversion tests with svn 1.5 2008-07-30 22:26:41 +02:00
Benoit Boissinot
9d636a4b09 make mq and tags hardlink safe 
The code didn't check for modes like "r+" or "rb+".
Many thanks to agriffis for noticing it.
 2008-07-23 16:08:20 +02:00
Patrick Mezard
1277ce4266 test-branches: add a test for long branch name (issue 1230) 2008-07-20 21:00:13 +02:00
Patrick Mezard
42c2e73f4f mq: fix qrefresh losing copy information (issue 1134) 2008-07-07 09:16:09 +02:00
Brendan Cully
2aef8dbc09 Check that git patches only touch files under root 2008-06-25 14:13:20 -07:00
Thomas Arendsen Hein
6fbdf04649 run-tests.py: Make tests run with python2.3 if HGTEST_* is set. 
optparse of python2.3 does not transform default values to the specified
type so e.g. "HGTEST_JOBS=4" (introduced in b8e8d6b0ae08) causes tests
to abort, because options.jobs is set to '4' instead of the number 4.
 2008-06-16 11:37:26 +02:00
Patrick Mezard
c7f6f81b90 Ignore dummy copies in dirstate and localrepo.filecommit() 2008-06-15 13:01:03 +02:00
Dirkjan Ochtman
fc7fc528ad show enabled extensions in hg help 2008-10-18 16:50:03 +02:00
Benoit Allard
38a25978ad graph: replace the blinking no javascript message 2008-10-18 16:09:07 +02:00
Christian Ebert
5cbc9e210a highlight: convert text to local before passing to pygmentize (issue1341) 
Example case:
Display file written in iso-8859-1 with current HGENCODING utf-8.
At the moment only an Error page appears because pygmentize
chokes on the replacement chars.

Alternatives:
1) Turn off highlighting and avoid UnicodeDecodeError
   for files that are not in HGENCODING.
2) [this patch] use util.tolocal to display these files.

Alternative 2) seems ok, as this only concerns display and
readability.

See also: c5f1a58b8b9a, apparently put aside during refactor of
highlight.

Add test for UnicodeDecodeError with iso-8859-1 file contents.
 2008-10-17 12:12:33 +02:00
Christian Ebert
586a27bcb7 notify: mime-encode messages 
- addresses will be properly encoded
- message bodies will also be encoded as we are not sending
  patches that are meant to be applied
- update test output
- adapt test-keyword to ignore the new headers
 2008-07-12 19:12:18 +01:00
Mads Kiilerich
552c248fa5 mq: Allow qrefresh --silent to take parameters 
'hg qrefresh --short file.txt' now adds changes made to file.txt to current
patch.

This builds on a patch for implementing --amend by Kirill Smelkov as discussed
in issue933.

FIXME: Why do mq refresh have two matchers if we only need one?
 2008-10-17 21:26:39 +02:00
Bernhard Leiner
78aef95fe0 Add parseindex2.py test case 
Make sure that the new implementation in C return that same values as the
original Python implementation.
 2008-10-17 01:05:10 +02:00
Dirkjan Ochtman
fc7a3b7024 tests: add some testing for patch.diffstat() 2008-10-17 17:34:25 +02:00
Benoit Boissinot
d6688cc959 bdiff: normalize the diff (issue1295) 
When the common part of a diff can be moved forward, move it forward.
Otherwise we don't get deterministic results (it would depends on the way we
split for the recursion).
That way we get identical hunks when doing the same change, it helps to solve
issue1295 (inconsistent diffs on different side during a merge).
 2008-10-14 20:13:53 +02:00
Patrick Mezard
71877ea8d9 convert: make built-in cvsps the default 
Reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>
 2008-10-15 20:14:28 +02:00
Benoit Boissinot
6f9f41a33d merge with crew 2008-10-15 16:27:36 +02:00
Benoit Boissinot
1d33f1c63b dirstate.walk: skip unreadable directories (issue1213) 
Do not abort on permission denied error, just skip the directory.
 2008-10-15 14:52:27 +02:00
Benoit Boissinot
45680829ac dirstate._dirs: fix refcounting broken by ece124266b74 
reported by Patrick Waugh
 2008-10-15 01:14:29 +02:00
Patrick Mezard
8e45917fce convert: fix builtin cvsps under Windows 
Drafted and reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>.
 2008-10-13 17:31:03 +01:00
Matt Mackall
c44a262dd5 inotify: add a test for lookup bug 2008-10-10 12:08:49 -05:00
Matt Mackall
84505139dc inotify: skip deactivation message 2008-10-10 11:29:57 -05:00
Patrick Mezard
0d0f719f13 tests: Windows compatibility fixes 
- printenv.py, md5sum.py, simplemerge, test-archive, test-merge1,
  test-merge-symlinks: set standard streams to binary mode
- test-encode: replace "gunzip" by "gzip -d"
- test-hup: requires fifo
 2008-10-12 19:11:59 +02:00
Patrick Mezard
e82fd2d627 Merge with crew-stable 2008-10-12 19:11:56 +02:00
Patrick Mezard
f8f73e46ef Merge with crew-stable 2008-10-10 13:20:40 +02:00
Patrick Mezard
e8a232c5c8 Show added files as "added" in editor commit message (issue 1330) 2008-10-09 14:16:17 +02:00
Alexander Solovyov
dfa7272d1d churn and stats commands merged 2008-10-09 00:14:20 +03:00
Matt Mackall
48ebb7a1ba merge: fix bug going backwards for already reverted files (issue1303) 2008-10-08 16:22:08 -05:00
Alexander Solovyov
0d41308ed2 churn: generalisation, now it is possible to see statistics grouped by custom template 2008-10-03 00:07:38 +03:00
Sune Foldager
9b5eac039b provide nicer feedback when an unknown node id is passed to a command 
Previously, an unknown node id would lead to the following error:
abort: 00changelog.i@343445453433: no node!

All other unknown revision would instead display as:
abort: unknown revision '343445453'!

The former error message has been suppressed in favor of the latter.
 2008-10-04 10:14:39 +02:00
Dirkjan Ochtman
1fde4bfba1 tests: check for bzr support by importing bzrlib 
This is better than starting bzr --version, because it works correctly when
running tests with a non-default Python (version).
 2008-10-02 16:22:02 +02:00
Benoit Boissinot
6866fd146e source doesn't work for some /bin/sh, use . instead 2008-09-29 12:12:53 +02:00
Patrick Mezard
4813e1621f get-with-headers: fix stream modes under Windows 2008-09-28 20:40:38 +02:00
Marek Kubica
0f790a60a5 convert: add bzr source 2008-09-26 20:33:47 +02:00
Dirkjan Ochtman
ba6b67f951 merge with crew-stable 2008-09-24 13:50:29 +02:00
Sune Foldager
1465c20864 fetch: use dirstate branch instead of first parents 2008-09-24 13:22:11 +02:00
Benoit Boissinot
66c79ea6b0 merge with -stable 2008-09-22 14:47:21 +02:00
Patrick Mezard
9b11dbf5dd Update coverage.py 
There is no technical reason to update it except it contains all the patches
already done in mercurial plus other stuff. It will be easier to update and
maintain in the future.
 2008-09-17 22:15:36 +02:00
Dirkjan Ochtman
0aa08a7ed8 merge with crew-stable 2008-09-17 11:34:37 +02:00
Rocco Rutte
f70a5a0f4e hgweb: Respond with HTTP 403 for disabled archive types instead of 404 
This makes it easier for clients/users to distinct between supported
but disabled and unsupported archive types.
 2008-09-05 17:28:37 +02:00
Benoit Boissinot
9ceefedcef merge with -stable 2008-09-10 23:20:04 +02:00
Benoit Boissinot
54526438a0 make test-mq-qdelete work reliably (issue1180) 
if after a and b has been applied, their hash starts with c, then the test
would fail (because there would be a rev c which would be seen as "applied")
so probability of failure would be 2*1/16.
 2008-09-10 17:55:49 +02:00
Benoit Boissinot
1dcbb85da7 run-tests.py: fix the check for the hg installation with -jn (n > 1) 2008-09-10 13:52:33 +02:00
Benoit Boissinot
401371bd20 merge backout 2008-09-10 08:49:05 +02:00
Benoit Boissinot
f4db28e2cc Backed out changeset 1aa58165fc81 (see issue916 for details) 2008-09-10 08:48:23 +02:00
Benoit Boissinot
7ba2d57a89 Do not try to load extensions twice (issue811) 2008-09-09 14:43:12 +02:00
Benoit Boissinot
416e5f2ef9 tag: without a checkout, base the tag changeset on tip instead of nullid 
issue916
 2008-09-08 14:04:10 +02:00
Sune Foldager
71dc05b36f fetch: added support for named branches 
Previously, fetch didn't really work when there were multiple named branches
in the repository. Now it tries to do the right thing(tm) in all situations.
 2008-09-08 12:55:46 +02:00
Sune Foldager
20edf348ee branch: added more support for named branches 
hg branch now has a -C (--clean) option, to reset the current (dirstate)
branch to the branch of the last commit (first parent).
 2008-09-08 12:55:27 +02:00
Martin Geisler
ca8bba4890 do not pretend to lock static-http repositories (issue994) 2008-09-08 11:32:53 +02:00
Benoit Boissinot
ebcbcef11c merge with -stable 2008-09-06 17:04:01 +02:00
Benoit Boissinot
ba9e79c7be merge with crew 2008-09-05 11:04:36 +02:00
Benoit Boissinot
0156251424 merge with -stable 2008-09-05 11:03:34 +02:00
Dirkjan Ochtman
051db6ab82 merge with crew-stable 2008-09-03 19:03:57 +02:00
Benoit Boissinot
20fc9c8d79 allow committing a removed directory 
fix issue1089
 2008-09-03 02:27:25 +02:00
Patrick Mezard
94ead662e7 convert: document source and sink identifiers, fix error message 2008-09-02 22:21:19 +02:00
Rocco Rutte
cc79439de6 highlight: only pygmentize for HTML mimetypes 
For non-html mimetypes it doesn't make much sense. This also fixes the
issue that highlight unconditionally adds a <link/> tag for its CSS to
the template's header (which is pointless in text/plain output).
 2008-09-05 10:39:57 +02:00
Patrick Mezard
20286160ce Merge with crew-stable 2008-09-02 09:47:40 +02:00
Benoit Boissinot
a45e96bda8 fix test output broken by 3268cb531b33 2008-09-02 01:19:12 +02:00