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
9,337 Commits 24 Branches 62 Tags 323 MiB
d825977cb1
Commit Graph

2504 Commits

Author SHA1 Message Date
Martin Geisler
1deb417a82 util: use built-in set and frozenset 
This drops Python 2.3 compatibility.
 2009-04-22 00:55:32 +02:00
Patrick Mezard
db8b25f86d Merge with crew-stable 2009-04-24 10:43:12 +02:00
Bryan O'Sullivan
39f59a8aee win32text: be more careful about rejecting violating changesets 
We now try to walk changesets in reverse order from newest to oldest,
so that if we see a file multiple times, we treat the newest version
as canonical.

This should prevent us from rejecting a changegroup that contains an
unacceptable commit followed later by a commit that fixes the problem.
 2009-04-24 00:06:01 -07:00
Matt Mackall
3322f13534 test-archive: silence stupid messages from GNU tar 
Recent versions of GNU tar have apparently decided they're old enough
that it's ok for them to prattle on senselessly about things no one
cares about without anyone objecting. We object; apply duct tape.
 2009-04-23 15:40:10 -05:00
Matt Mackall
e8b3de6bf8 ui: introduce new config parser 2009-04-23 15:40:10 -05:00
Matt Mackall
371257fd73 ui: fold readsections into readconfig 
readconfig now reads only single files
readconfig takes an optional list of sections
readconfig trusts files we're looking for sections in
 2009-04-23 15:40:10 -05:00
Matt Mackall
c85f431ef9 ui: cleanup _is_trusted a bit 2009-04-23 15:40:10 -05:00
Matt Mackall
0174734c46 ui: kill updateopts 
Move setconfig into dispatch._parseconfig
 2009-04-23 15:40:10 -05:00
Matt Mackall
ebffe5ccb8 ui: refactor option setting 
No more passing options as constructor keywords. Basic options are now
always stored in the overlay for simplicity and consistency.
 2009-04-23 15:40:10 -05:00
Patrick Mezard
6205446ef7 Merge with crew-stable 2009-04-23 16:52:25 +02:00
Martin Geisler
80dd126e92 remove unnecessary outer parenthesis in if-statements 2009-04-22 01:39:47 +02:00
Simon Heimberg
e9ecbcc326 run-tests: fix error when timeout occurs 2009-04-22 09:11:46 +02:00
Benoit Boissinot
3da3b1d1e0 run-tests: fix -jN broken by eb47f6866e97 2009-04-22 01:53:15 +02:00
Patrick Mezard
33d1383a9e Merge with crew-stable 2009-04-21 14:25:36 +02:00
Martin Geisler
f3f344d0c5 run-tests: removed some underscores (coding style) 2009-04-21 11:19:10 +02:00
Martin Geisler
6f1fe4b8fc run-tests: upper-case global PYTHON variable 2009-04-21 10:53:42 +02:00
Greg Ward
7b736bed65 run-tests: reduce global variables set by parse_args(). 2009-04-20 21:50:11 -04:00
Greg Ward
e0391753e2 run-tests: factor out main(); reduce use of globals a bit. 2009-04-20 21:42:20 -04:00
Greg Ward
2f2a34c5e7 run-tests: move bits of main program so it's all at the bottom. 2009-04-20 21:10:39 -04:00
Greg Ward
5de1444cff run-tests: move _hgpath() up so it's not in the middle of the main program. 2009-04-20 21:07:05 -04:00
Greg Ward
0f9eca8100 run-tests: factor out parse_args(). Clarify use of globals a bit. 2009-04-20 21:04:24 -04:00
Greg Ward
c1e5c578c4 Add comment about this test failing under bzr 1.13 due to a bug in bzr. 2009-04-19 07:55:53 -04:00
Christian Ebert
510a4bc8a5 test-highlight: adapt output to latest pygments keeping backwards compatibility 2009-04-19 13:27:03 +01:00
Benoit Boissinot
4114ea7f05 merge with stable 2009-04-18 22:54:37 +02:00
Martin Geisler
52ce98c9a8 help texts: write command line switches as -a/--abc 2009-04-18 14:40:21 +02:00
Henrik Stuart
c1e6537e5f strip: make repair.strip transactional to avoid repository corruption 
Uses a transaction instance from the local repository to journal the
truncation of revlog files, such that if a strip only partially completes,
hg recover will be able to finish the truncate of all the files.

The potential unbundling of changes that have been backed up to be restored
later will, in case of an error, have to be unbundled manually. The
difference is that it will be possible to recover the repository state so
the unbundle can actually succeed.
 2009-04-16 15:34:03 +02:00
Patrick Mezard
cd3505dbbc Merge with crew-stable 2009-04-13 21:57:17 +02:00
Nicolas Dumazet
36eacb3699 run-tests: detect when hghave fails to check for a feature and fail test 
hghave exitcode != 0 might mean that hghave failed to check for feature
avaibility. Detect those cases, and fail the test, instead of skipping it.
 2009-04-08 02:38:23 +09:00
Nicolas Dumazet
f5d17ae79b hghave: checking that all targets are Exception-free 2009-04-08 02:34:00 +09:00
Vsevolod Solovyov
201e56ffbb Fix issue1495, corner case of adding empty files via patching 2009-03-24 23:28:55 +00:00
madhu@madhu
d6166450e5 Returns lines changed for paths specified as arguments correctly. 
This fixes issue 1569. hg churn <path> now returns only the number
of lines changed in the path, if the path is specified by filtering
files through a match filter at the changeset level. test-churn
has been updated to take care of this issue.
 2009-03-25 01:49:03 +05:30
Matt Mackall
1fca17b321 Fix new CVS test output 2009-03-20 18:49:44 -05:00
Greg Ward
c9426abe07 cvsps: recognize and eliminate CVS' synthetic "file added" revisions. 2009-03-18 09:15:38 -04:00
Benjamin Pollack
022828a7a5 regression test for issue1552 
Ensures that fetch correctly infers what to merge when pulling a
repository with inactive branches.
 2009-03-17 11:34:40 -04:00
Matt Mackall
7d51e0b1f6 bundlerepo: reintroduce dirstate 2009-03-17 13:43:11 -05:00
Matt Mackall
e31a8bb788 atom: fix URLs used in entry GUIDs 2009-03-16 17:21:06 -05:00
Matt Mackall
891ec3832e resolve: keep .orig files 2009-03-16 16:58:41 -05:00
Matt Mackall
56a3a8557f Merge with crew-stable 2009-03-09 11:41:38 -05:00
Benoit Boissinot
c34938cba1 verify: find correct first corrupted cset for missing/corrupted revlogs 2009-03-07 20:16:03 +01:00
Mads Kiilerich
240dc61d24 test-identify: require no-outer-repo 
The test expects "There is no Mercurial repository here (.hg not found)"
 2009-03-05 14:53:59 +01:00
Frank Kingswood
a2f1d401c2 convert: Perforce source for conversion to Mercurial 2009-03-03 21:32:23 +00:00
Matt Mackall
f91e781c87 remove tests for long-gone imerge extension 2009-03-04 18:42:24 -06:00
Augie Fackler
bf90b0cbb4 merge: better error messages to lead users to hg update --clean to abandon merges. 
Fixes issue1533.
 2009-03-04 13:06:16 -06:00
Matt Mackall
5871cdf2c8 audit: be even pickier (issue1450) 2009-03-04 17:02:16 -06:00
Alex Unden
eb753f04dc bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set 2009-02-27 02:01:45 -08:00
David Soria Parra
f6ec2e9b01 bookmarks: Set current bookmark if we create a new one on the tip 
If track.current is enabled we set the newly created bookmark as the
current tracked bookmark. We do not do this if a revision is specified.
 2009-03-01 00:30:01 +01:00
Matt Mackall
6ed04dc163 convert: change hg.saverev default to False 
This needlessly breaks changeset identifiers for the common case (cleaning
history), which is sad.
 2009-03-02 19:19:12 -06:00
Matt Mackall
104cda5c20 tag: force load of tag cache 2009-03-02 19:19:09 -06:00
Mads Kiilerich
2694fdc1a4 run-tests.py: avoid using popen2.Popen4 - use subprocess instead 
Use subprocess to emulate Popen4 if available - similar to how it is done in
util.py.

Using popen2 under python 2.6 gives
DeprecationWarning: The popen2 module is deprecated.  Use the subprocess module.
 2009-02-27 19:10:38 +01:00
Mads Kiilerich
9686279212 test-convert-cvs*: mute output from "cvs up" 
Apparently some versions of cvs outputs more than other versions. That is
however not relevant for these tests.
 2009-02-27 17:52:31 +01:00
timeless
26d95caa99 help: miscellaneous language fixes 2009-02-28 12:38:45 +01:00
Frank Wierzbicki
975c4301af tests: use same popen strategy for jython as for nt 2009-02-18 13:19:30 +01:00
Matt Mackall
cb4d50ff04 Introduce HG_PREPEND to solve pretxn races 
- add writepending to flush delayed writes to separate file
- add support in hooks for lazy evaluation of callable parameters
- add HG_PENDING to pretxn hooks
  - call writepending if hook is used
  - pass repo root to hook environment
- if HG_PENDING = repo root, we're in pretxn hook
  - read pending data to make pending changesets visible
- filter HG_PENDING in tests/printenv.py
 2009-02-16 19:35:07 -06:00
Patrick Mezard
257f0454c4 Merge with crew-stable 2009-04-11 23:21:39 +02:00
Patrick Mezard
d34099656d convert/cvs: delay CVS log parsing after initialization (issue1581/2) 
Source and destination constructors should be fast so configurations issues are
hit quickly, including authentication and filemap/authormap/splicemap issues.
Delaying might be a problem if the remove side disconnects idle connections
while the log is being read. It did not happen when converting openafs
repository, where log retrieval took at least 10mn.
 2009-04-11 21:17:11 +02:00
Patrick Mezard
b6f490f554 convert: better mapfile parsing errors (issue1581/1) 2009-04-11 21:15:27 +02:00
Patrick Mezard
ea6ab7b729 Merge with crew-stable 2009-04-11 20:49:47 +02:00
Patrick Mezard
629f02e472 purge: fix 7625ece8e2f7 (remove read-only files) 
- use try/except to avoid unnecessary work
- edit only mode bits
 2009-04-11 00:13:18 +02:00
Patrick Mezard
229740c001 purge: remove read-only files under Windows (issue583) 
Initial version by Benoit Boissinot <bboissin@gmail.com>
 2009-04-10 21:20:28 +02:00
Martin Geisler
a0c28e829e commands: more informative description of "!" files in status 
This makes the description more similar to the one used by Subversion.
Suggestion by Dennis Brakhane.
 2009-04-09 20:00:48 +02:00
Martin Geisler
e8820e5792 commands: automatically word-wrap cmdline options 
Some of the descriptions of command line options were getting quite
long, and when translated they are likely to grow even longer. This
word-wraps them at 70 characters, just like the help texts.

We could have opted to wrap them at the terminal width instead, but I
think it looks better to have them be consistent with the help texts.
 2009-04-09 14:43:02 +02:00
Patrick Mezard
8b64865271 Merge with crew-stable 2009-04-08 23:24:22 +02:00
Martin Geisler
bee180f29b commands: consistently write switches as -a/--abc 2009-04-08 21:20:31 +02:00
Martin Geisler
a135216a5b upper-case command line meta variables 2009-04-08 20:43:19 +02:00
Martin Geisler
e45e28d3cc notify, commands: word-wrap help strings 2009-04-08 00:41:07 +02:00
Martin Geisler
42fa3800bd expand "rev" to "revision" in help texts 2009-04-07 23:06:50 +02:00
Martin Geisler
249541da43 expand "repo" to "repository" in help texts 2009-04-07 22:58:05 +02:00
Martin Geisler
ea1734b579 expand "dir" to "directory" in help texts 2009-04-07 22:47:56 +02:00
Henrik Stuart
670fb51b7d patchbomb: Support initial in-reply-to header 
This allows follow-up/revised patches to appear properly threaded
in mail readers and in the archives, reducing noise.
 2009-04-08 19:32:16 +02:00
Nicolas Dumazet
6ebdee6dde profiling: Adding support for kcachegrind output format, using lsprofcalltree 2009-04-08 14:20:57 +02:00
Nicolas Dumazet
f2cfd93c8c profiling: Adding a profiling.format config variable 
Allows defining other output formats for profiling.

If an invalid format is given, output a warning and ignore it.
For now, only the standard 'text' value is supported.
 2009-04-02 16:01:30 +09:00
Nicolas Dumazet
14ff1a53ae profiling: Adding profiling.output config variable 
If specified, outputs profiling data to the said file.
Prints to stderr by default
 2009-04-08 14:19:41 +02:00
Nicolas Dumazet
b87b90da60 profiling: dropping hotshot profiling. --profile as a unique profiling option 
hotshot was an experimental module, which is broken for Python < 2.5
And even for Python >= 2.5 users, hotshot usage is discouraged: cProfile
(formerly lsprof) should be used instead.
 2009-04-08 14:18:20 +02:00
Henrik Stuart
235c60980e log: fix broken multiple user search 
This fix also allows partial user matches so the full name and email
does not have to be written out in verbatim.
 2009-04-07 20:57:25 +02:00
Martin Geisler
79a1ecab7b commands: describe "!" files as "missing" in help for status 2009-04-07 17:32:40 +02:00
Benoit Boissinot
309c0e0a31 merge with -stable 2009-04-06 20:11:00 +02:00
Dirkjan Ochtman
2ad060935d tests: use unified diff in test-command-template for better error reports 2009-04-06 10:53:01 +02:00
Martin Geisler
1e1d82e968 convert: align option types in help text 2009-04-05 13:20:30 +02:00
Wagner Bruna
103904e6a1 commands: fix typo on flag description 2009-04-05 05:12:43 -03:00
Martin Geisler
f1c1a1fa6e commands: word-wrap help texts at 70 characters 2009-04-04 23:21:23 +02:00
Martin Geisler
b37b6d3cd0 rebase: word-wrap help texts at 70 characters 2009-04-04 23:19:11 +02:00
Martin Geisler
9d08018e0f keyword: word-wrap help texts at 70 characters 2009-04-04 23:17:53 +02:00
Martin Geisler
69ba878bb4 convert: word-wrap help texts at 70 characters 2009-04-04 23:16:55 +02:00
Martin Geisler
04b0d911a3 Change double spaces to single spaces in help texts. 2009-04-04 21:09:43 +02:00
Martin Geisler
af7a5be45e commands, help: consistently write 'URL' in upper-case 2009-04-04 17:44:18 +02:00
Martin Geisler
695e12c72b commands: use single-quotes for 'hg help ...' hints 2009-04-04 00:27:55 +02:00
Matt Mackall
f2b63f05d7 convert: attempt to check repo type before checking for tool 2009-04-04 12:28:13 -05:00
Dirkjan Ochtman
049b5daa9b merge with crew-stable 2009-04-04 19:43:00 +02:00
Marti Raudsepp
b717070e88 convert: handle comments starting with '#' in authormap files 2009-04-04 18:04:38 +02:00
Marti Raudsepp
f86045b534 convert: fix authormap handling of lines without '=' 
Unpacking the result from str.split raises ValueError, not IndexError, if the
line does not contain a '='.
 2009-04-04 15:41:32 +02:00
Marti Raudsepp
387a098ed6 convert: Add testcase for convert authormap. 2009-03-14 14:31:08 +02:00
Christian Ebert
3849a2cc57 tests: guess lexer by filename for recent pygments 
Recent pygments guess AntlrJavaLexer for the isolatin text, converted to ascii
by util.tolocal, which yields class="err". Guess lexer by extension instead.
 2009-04-04 15:14:36 +02:00
Pavel Volkovitskiy
d933c50ed4 right way to check if file was in renamed directory, fixes import monotone 
repos with renamed directories
 2009-04-02 22:25:49 +04:00
Henrik Stuart
ced279d296 convert: added cvsnt mergepoint support 2009-04-02 14:48:06 +02:00
Stefano Tortarolo
73c9e38e37 rebase: keep original mq patch format (Issue1574) 
Rebase now doesn't make assumptions about which format has been
used for a mq patch (git or normal).
Before finalizing a patch it keeps track of the original format,
by reading its header, and then restores the format when reimporting
it.
This way it also allows for having mixed styles.

Note: this version corrects a failure in the test
 2009-03-26 16:58:50 +02:00
Stefano Tortarolo
3d01e07230 rebase: don't lose rename/copy data (Issue1423) 2009-03-30 18:26:32 +02:00
Justin Peng
d4938a90ee Correct a bug on date formats with '>' or '<' accompanied by space characters. 2009-04-01 09:11:00 -07:00
Stefano Tortarolo
6016fce500 rebase: store/restore arguments correctly 
Keep and keepbranches were lost after an interruption
 2009-03-29 14:43:49 +02:00
Stefano Tortarolo
f885e061f2 rebase: correct help text 
Show the correct parameters in help text
 2009-03-29 14:47:59 +02:00
Steve Borho
63d4e6092c on clone failure, only remove directories we created 
If the user created the clone target directory before running
the clone command, only cleanup the .hg/ repository when errors
occur.  Leave the empty target directory in place.
 2009-03-31 21:21:53 -05:00
Greg Ward
558dacc406 issue1582: improve description of splicemap syntax in help. 2009-03-31 15:52:48 -04:00
Steve Borho
ad54f46fa2 allow clone into existing but empty directories 2009-03-29 16:15:06 -05:00
Benoit Boissinot
1f5f22d2a8 merge with backout 2009-03-30 01:23:12 +02:00
Benoit Boissinot
fe6c4f18cd Backed out changeset d4343088804c 
The difference came from a configuration difference (network unreachable vs.
connection refused), not from an OS change.
 2009-03-30 01:23:01 +02:00
Rocco Rutte
a1eb264519 record: Give user a hint about chunk selection progress 
It greatly improves usability when one roughly knows where
the chunks of interest are.
 2009-03-28 23:09:36 +01:00
Rocco Rutte
0e71380f6b coal/paper: Turn <img> into <img/> where missing 2009-03-28 22:22:22 +01:00
Benoit Boissinot
6712106532 add missing +x flag to test-inotify-issue1542 2009-03-28 19:50:37 +01:00
Mads Kiilerich
36ec467f85 convert: missing p4 tool is only slightly fatal 
checktool with default abort=True caused convert to fail too early.
 2009-03-27 13:39:18 +01:00
John Coomes
664dabc0ed tests: strip o/s-dependent error messages from some http tests 2009-02-27 17:28:26 -08:00
Nicolas Dumazet
ddda9ba6fe Fixing issue1542, adding a relevant test 
inotify is smart enough to notify you about any changes in a
directory, even if you only watch the directory, and none if its
contents: the recursive add_watch I added was unnecessary.

The only thing that matters here is the recursive status update on
directory deletion.

And scan() has to be called _before_ the deferred call is registered.
(race condition: depending on the times, the previous patch could
apparently fail on the provided test. It's not the case anymore.)
 2009-03-26 19:01:06 +09:00
Matt Mackall
b6fd334dd0 Merge with -stable 2009-03-24 16:41:41 -05:00
Dirkjan Ochtman
33d6485beb add debugcommands command: an easy to parse command + option index 2009-03-23 13:43:48 +01:00
Alexander Solovyov
475ce753d3 templater: ability to display diffstat for log-like commands 2009-03-23 10:41:42 +01:00
Matt Mackall
68f6893175 Merge with -stable 2009-03-20 18:55:20 -05:00
Lee Cantey
1f2673b393 Fix for merge changes introduced in rev 397091458855 2009-03-19 10:25:13 -07:00
Matt Mackall
4cd17487f7 Merge with stable 2009-03-17 13:46:53 -05:00
Mads Kiilerich
21fd26f154 test-merge-tools: test ui.merge functionality and selection of internal tools 2009-03-09 18:44:44 +01:00
Stefano Tortarolo
ae208b3a98 rebase: pull --rebase updates if there is nothing to rebase 2009-01-18 19:59:51 +01:00
Mads Kiilerich
d6ab2f95b5 test-merge-tool: Make sure no hgmerge can be found in $PATH 
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
 2009-02-10 22:47:38 +01:00
Matt Mackall
2e1730294c patch: teach selectfile about symlinks (issue1438) 2009-02-16 17:37:23 -06:00
Matt Mackall
1a2d87e4e1 mq: handle empty patches more gracefully (issue1501) 2009-02-16 17:37:23 -06:00
Simon Heimberg
23251d5bdf test suite: saver check if bzr is installed 
Test if bzrlib.__doc__ is not empty. Ignores an empty lib.
 2009-02-08 13:46:04 +01:00
Augie Fackler
7131a2f8b7 fancyopts: Parse options that occur after arguments. 
This changes the behavior of qguard in the case of setting negative guards, as -- will now always be required.
Fixes issue1402.
Doc fixes for mq by mpm.
 2009-02-10 13:26:00 -06:00
Augie Fackler
0dd0e4f46d tests: Add a test for the behavior of 'hg export -- -2' 2009-02-10 16:31:52 -06:00
Mads Kiilerich
9b111ad022 test-merge-tools: Don't use tac 
"tac" was a bad tool - is not available on all platforms.

The test now only uses the "tools" true, false, head, echo, cat and /bin/cat
 2009-02-10 16:11:48 +01:00
Matt Mackall
d7c2a2e49b merge: mark kept local files as readded on linear update (issue539) 2009-02-15 10:50:48 -06:00
Jim Correia
78e5b53d7d add --git option to commands supporting --patch (log, incoming, history, tip) 
No short -g form, since it would conflict with -g from the graphlog extension.
 2009-02-14 22:40:39 +01:00
Dirkjan Ochtman
29fd92e139 tests: fix for test-identify returning 255 2009-02-13 13:52:34 +01:00
Gilles Moris
60d2f6f240 extdiff: add --change option to display single changeset diff 
This is the counterpart for extdiff of 44ccab2b73f0.
 2009-02-07 19:41:05 +01:00
Dirkjan Ochtman
73563fa8ff identify: have consistent output for local repositories 
Also, add some extensive testing for it (hardly any in the suite so far).
 2009-02-13 11:32:33 +01:00
Martin Geisler
8d98ac17bc reset mergestate after commit 2008-12-25 10:42:01 +01:00
Mads Kiilerich
d775f5aa2a Make util.find_exe alway returns existing file, fixing issue1459 
It seems like the old behaviour with different handling for commands with and
without path was intended, but I think this behaviour of util.find_exe is
better:
* Always returns existing file
* or None if command not found - no default
* Windows: Returned file thus always ends with extension from PATHEXT

This fixes http://www.selenic.com/mercurial/bts/issue1459. The change might
fix other unintended behaviour too.
 2009-01-25 21:20:13 +01:00
Mads Kiilerich
ec83cadc8e test-merge-tools 
Some tests of merge-tools configuration and selection, mostly excercising
filemerge.py
 2009-01-25 21:20:11 +01:00
Jim Correia
652c76f46a Account for symlinks when setting up HGTMP. 
On Mac OS X, several top-level directories are actually symlinks into
/private. When setting up HGTMP, expand the symlinks so that later
comparisons to or substituations with the actual path work as expected.
 2009-01-25 14:12:41 -05:00
Benoit Allard
c429e1d8f6 coal/paper: switch to XHTML 1.1 2009-02-05 18:15:33 +01:00
Martin Geisler
8fdb89c045 run-tests: add --pure flag for using pure Python modules 2009-01-31 22:50:18 +01:00
Benoit Boissinot
51f22b2a1b merge with crew 2009-01-27 18:17:59 +01:00
Steve Borho
4860997ffa record: do not lose permission changes on commit 2009-01-27 09:58:48 -06:00
Dirkjan Ochtman
e5623f9c50 graphlog: some testing for incoming and outgoing graphs 2009-01-26 16:34:38 +01:00
Matt Mackall
e0882a579f fix up tests for paths and urls help 2009-01-25 12:07:41 -06:00
Patrick Mezard
1977ae7dbb Merge with crew-stable 2009-01-25 18:58:12 +01:00
Patrick Mezard
56a4e737a8 Fix a corner case when committing a rename after a merge (issue1476) 2009-01-25 18:55:29 +01:00
Dirkjan Ochtman
4e4940dc82 templater: fix age filter to state the obvious on future timestamps 2009-01-22 16:07:44 +01:00
Dirkjan Ochtman
2976fb29b0 tests: fix issue in test-audit-path with HGTMP on OS X 2009-01-22 15:22:37 +01:00
Dirkjan Ochtman
ed55287ff1 tests: eliminate use of sed -i (which fails on NetBSD) 2009-01-22 14:33:49 +01:00
Dirkjan Ochtman
44cb61f1a6 tests: fix up tests to cope with 8d681e04a351 2009-01-22 14:32:39 +01:00
Dirkjan Ochtman
c4b462d161 merge with crew-stable 2009-01-19 12:58:01 +01:00
Stepan Koltsov
1fa2450a68 coal/paper: add missing spaces in changeset child formatting 2009-01-19 12:36:06 +01:00
Christian Ebert
5afb33fd34 notify: fix neglect of custom headers set via template 
0366830cd960 introduced a bug that discarded all custom headers.
Add custom header to test template.
 2009-01-15 01:38:52 +01:00
Patrick Mezard
a70c4ebc9d merge: fix execute bit update issue introduced by db8aabe14ff1 2009-01-13 22:41:06 +01:00
Patrick Mezard
7ab8b3fde9 diffstat: don't fail on merges 
First version by Alexander Solovyov <piranha@piranha.org.ua>
 2009-01-13 20:28:06 +02:00
Christian Ebert
4f717b637b notify: fix neglect of custom headers set via template 
0366830cd960 introduced a bug that discarded all custom headers.
Add custom header to test template.
 2009-01-15 01:38:52 +01:00
John Mulligan
5d89493a96 branch closing: add test for branch closing (and reopening) 2009-01-14 21:47:38 -05:00
John Mulligan
9e580fc6f7 store all heads of a branch in the branch cache 
All heads of branches will be stored in a new cache file 'branchheads.cache'
within the .hg directory. The old 'branch.cache' file from older versions
will be ignored.

The new cache contents are formatted line-by-line as '{node} {branchtag}\n'.
This is the same as the previous format. Now, every head is recorded in
an oldest -> tipmost order.

The localrepo.branchheads function is reworked to use the data from the cache.
 2009-01-14 21:47:38 -05:00
Bernhard Leiner
bf4052120f mq: make qnew patch format consistent with qrefresh (issue1457) 2009-01-12 09:12:35 +01:00
Matt Mackall
356502607f refactor version code 
- simplify version detection code
- move detection code into setup.py
- move version reading function into util.py
- drop version.py code

This makes hg more closely follow its own recommendation of how to deal with
versioning your builds: use hg id in your build script.
 2009-01-10 18:02:38 -06:00
Patrick Mezard
6aa7cd6f84 Merge with crew-stable 2009-01-13 23:17:19 +01:00
Stepan Koltsov
321c35acaa diff: add --change option to display single changeset diff (issue1420) 2009-01-13 10:44:16 +01:00
Benoit Boissinot
75e98806a7 web: use the correct filectx in filelog 2009-01-09 17:34:06 +01:00
Benoit Boissinot
9eaa24618d correctly update dirstate after update+mode change (issue1456) 2009-01-07 02:11:17 +01:00
Jason Orendorff
500c43b1e4 mq: don't warn about ambiguous patch name when using patch index (issue1439) 2009-01-06 10:30:22 +01:00
Patrick Mezard
cfa7c44e4c convert/gnuarch: fix switched copy source and destination 
Reported by Edouard Gomez <ed.gomez@free.fr>
 2009-01-05 14:34:20 +01:00
Patrick Mezard
c8f0bb9bb7 mq: drop copy records when refreshing regular patches (issue1441) 
Copy information was saved in a common loop, then refined in a git-only block.
The problem was the latter did filter out renames occuring in the current
patch and irrelevant to commit. In the non-git case, copy records still existed
in the dirstate, referencing removed files, making the commit to fail. Git and
non-git copy handling paths are now separated for simplicity.

Reported by Gary Bernhardt
 2009-01-04 21:32:40 +01:00
Dirkjan Ochtman
074cf082f4 hgweb: fix problems with empty repositories 2009-01-04 19:10:42 +01:00
Patrick Mezard
7930704b3e localrepo: fix bad manifest delta generation (issue1433) 
The issue came from the 63f9ab8034d1 fix for issue586 working only for
manifest.add() fast path, where the incorrect removed file set was
ignored. This path was no longer taken after 5958346d119e refactoring.
 2009-01-03 20:16:10 +01:00
Mark Edgington
fcbe766152 hgweb: send HTTP unauthorized error when denying pull 2009-01-03 20:50:06 +01:00
Martin Geisler
dc4fd3bf46 mq: lowercase output 
This extension produces quite a lot of informational messages during
its normal operation and it is hard to say which strings can be
changed and which cannot.
 2009-01-03 17:15:21 +01:00
Stefan Ring
171ebe0873 Improved hgweb test. 
The hgweb fix in dc83349025f7 aimed at restoring the "back" link in hgweb's
filelog that has been lost in 81d0ede3de31. However, the previous version of
this test ran the filelog command on a file with only a single filelog entry.
In this case, the previous hgweb version did not exhibit the bug. The error
condition is now correctly tested with a filelog of 2 entries.
 2009-01-12 13:20:09 +01:00
Dirkjan Ochtman
e53eace7ea tests: use killdaemons.py in test-highlight 2009-01-12 09:57:52 +01:00
Dirkjan Ochtman
aabce1d60c mq: allow qpop if popped revisions are not working dir parents 2009-01-12 09:07:02 +01:00
Dirkjan Ochtman
b62067242a merge with crew-stable 2009-01-12 09:13:45 +01:00
Benoit Boissinot
6b71924a1b merge with -stable 2009-01-09 18:12:53 +01:00
Benoit Boissinot
b3e502e61c merge with -stable 2009-01-07 02:13:32 +01:00
Dirkjan Ochtman
7898fef4da merge with crew-stable 2009-01-06 10:33:57 +01:00
Dirkjan Ochtman
03e3ada916 tests: shrink wait interval for test-convert-bzr-merges 2009-01-05 18:45:20 +01:00
Patrick Mezard
cdcf39e446 Merge with crew-stable 2009-01-05 14:37:46 +01:00
Marek Kubica
3a78577a8b tests: try to prevent different ordering in test-convert-bzr-merges 2009-01-05 12:31:00 +01:00
Benoit Boissinot
722aaa1329 merge with crew 2009-01-04 21:49:37 +01:00
Patrick Mezard
93125a20b3 Merge with crew-stable 2009-01-04 21:44:06 +01:00
Frank Kingswood
c52ddbe980 test: added testcase for cvsps log message lookahead 2009-01-04 10:06:44 +00:00
Dirkjan Ochtman
ad878f12a5 merge with crew-stable 2009-01-04 19:13:02 +01:00
Benoit Boissinot
f1393e61f3 merge with crew 2009-01-04 13:52:28 +01:00
Peter Arrenbrecht
cbd55becad test-audit-path: add one more test (issue 1450) 2009-01-04 08:06:05 +01:00
Patrick Mezard
66fcf68fa2 Merge with crew-stable 2009-01-03 21:54:58 +01:00
Dirkjan Ochtman
823b43d5b5 tests: use killdaemons.py in test-pull-http 2009-01-03 20:20:40 +01:00
Dirkjan Ochtman
25cd3135ab merge with crew-stable 2009-01-03 21:24:31 +01:00
Martin Geisler
cbcd677f60 lowercase ui.debug and assert output 
This does not effect the log or status commands and should be okay
according to the compatibility rules.
 2009-01-03 17:15:21 +01:00
Martin Geisler
23608038bf lowercase help output 
Changes docstrings to begin with a lowercase word. Only docstrings
used in help output is changed.

Scripts are not expected to grep the output of 'hg help' so this
change should pose no problem with regard to the compatibility rules.
 2009-01-03 17:15:15 +01:00
Matt Mackall
a25d874c56 Merge with -stable 2008-12-31 18:00:35 -06:00
Peter Arrenbrecht
e4941ea8f1 test-audit-path: add more tests (issue 1450) 2008-12-30 22:10:41 +01:00
Bernhard Leiner
586b4a2c7c Circumvent removal of valid bisect candidates due to previously skipped ones 
As reported in issue 1445:
A valid candidate revision for a bisect test is not considered for testing
due to its skipped ancestor. If this revision is the only untested one left
an assertion error occurs.
 2008-12-27 19:05:26 +01:00
Benoit Boissinot
e2908a6b20 merge bookmarks 2008-12-31 15:04:18 +01:00
David Soria Parra
b3a470f0b4 bookmarks: tests for track.current option 2008-12-31 14:29:51 +01:00
Gilles Moris
9b7deb4420 test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py 
Note that other sed replacement commands are also filtering get-with-headers.py,
but they seem to be more test specific, hence not handled here.
 2008-12-25 17:49:08 +01:00
Alexander Solovyov
c1774bb6c3 python implementation of diffstat 
Implemented as two functions: diffstat, which yields lines of text,
formatted as a usual diffstat output, and diffstatdata, which is called
inside diffstat to do real performing and yield file names with
appropriate data (numbers of added and removed lines).
 2008-12-25 10:48:24 +02:00
Benoit Boissinot
c79382f326 merge with -stable 2008-12-28 20:21:20 +01:00
Dirkjan Ochtman
934178e495 merge with stable 2008-12-20 13:09:05 +01:00
Matt Mackall
bb9114d8ba resolve: clarify and simplify help 2008-12-19 20:58:33 -06:00
Matt Mackall
003766b33a tests: fix no-diffs option 2008-12-19 16:48:32 -06:00
Matt Mackall
96311238c8 archive: fix bogus error message with no working directory 2008-12-19 16:48:31 -06:00
Matt Mackall
966fa4be08 resolve: require -a switch to resolve all files 
Like revert -a, this should make this command slightly safer
 2008-12-19 16:47:36 -06:00
Dirkjan Ochtman
265b2d6c5c merge with crew-stable 2008-12-19 18:49:02 +01:00
Dirkjan Ochtman
600f058f30 hgweb: mq repos should be in non-recursive collections, too 2008-12-19 18:24:49 +01:00
Dirkjan Ochtman
46c7d48798 merge with crew-stable (again) 2008-12-19 08:42:41 +01:00
Dirkjan Ochtman
21211bc14d tests: fix test-mq-qclone-http (broken by 8cf97ec9314a) 2008-12-19 08:41:46 +01:00
Dirkjan Ochtman
8215a72dd6 merge with crew-stable 2008-12-19 08:20:19 +01:00
Benoit Allard
6edf6273f0 hgweb: recurse down collections only if ** in [paths] 
collections: direct child repos only
paths *: direct child repos only (like collections)
paths **: recursive discovery

When ** is used, the mq repository (if any) is also shown.
 2008-12-18 22:32:48 +01:00
Brendan Cully
81d39df2bc Merge with crew-stable 2008-12-14 23:05:18 -08:00
Brendan Cully
6e6159b63f patch: handle git patches that remove symlinks (issue1438) 2008-12-14 23:04:29 -08:00
Adrian Buehlmann
b2991e8893 store: encode trailing period and space on directory names (issue1417) 
Windows won't create directories with names ending in period or space, so
we encode the last period/space character in directory names of non-hashed
paths in the store using reversible ~xx encoding (' ' -> '~20', '.' -> '~2e').

With this change it is possible to remove a directory ending in period or space
that was inadvertantly checked in on a linux system while still being able
to clone such a repository with its full history to Windows (see also issue793).
 2008-12-13 18:32:29 +01:00
Adrian Buehlmann
9a0526b2cd store: don't create dirs ending in period or space for hashed paths (issue1417) 
Windows won't create directories with names ending in period or space, so
we replace the last period/space character in truncated directory names of
hashed paths with some other character (underbar).
 2008-12-13 17:39:56 +01:00
David Soria Parra
18c8648fbf bookmarks: Fix tests 
As we merge tags now with bookmarks we have add those tags
to the tests.
 2008-12-06 16:15:59 +01:00
Patrick Mezard
1620a3ec34 Merge with crew-stable 2008-12-14 18:13:41 +01:00
Benoit Boissinot
f57ea72890 merge with -stable 2008-12-13 13:28:20 +01:00
Patrick Mezard
50f814764a Merge with crew-stable 2008-12-11 23:36:43 +01:00
Patrick Mezard
b8790bb493 test-mq-missing: add test for directory creation on git copy 2008-12-11 22:59:35 +01:00
Patrick Mezard
0f741b13f8 test-convert-cvs-builtincvsps: test debugcvsps command 2008-12-10 17:47:56 +01:00
Patrick Mezard
42823196e7 Merge with crew-stable 2008-12-10 00:29:10 +01:00
Patrick Mezard
1ab0600f40 util: disable walkrepo() recursive behaviour 
Revert b1aea76f700 and c6d3b233571e for performances reasons. Traversing
checkout working directories may be too expensive.
 2008-12-10 00:16:12 +01:00
Benoit Allard
a26522bf8d tests: test-walkrepo shouldn't throw SystemExit 
Write to stdout instead of throwing Exceptions
 2008-12-08 20:42:53 +01:00
David Soria Parra
aa564788a6 Merge bookmarks 2008-12-07 08:47:02 +01:00
Patrick Mezard
951d92c2e0 Merge with crew-stable 2008-12-06 20:17:45 +01:00
Patrick Mezard
a03d1cd8a8 convert: backout 54f9cfa0c3a5 
This change is brain damaged, there is no reason the copyfrom revision of the
project items may have any relevance when deciding the revision parent. It is
meaningful only when fetching files content.

Incorrect converted graph was spotted in pyglet svn repository at:

------------------------------------------------------------------------
r274 | r1chardj0n3s | 2006-12-21 02:02:14 +0100 (Jeu, 21 Dec 2006) | 2 lines
Changed paths:
   A /branches/richard-glx-version (from /trunk:269)
   M /branches/richard-glx-version/pyglet/window/xlib/__init__.py
   R /branches/richard-glx-version/tests/test.py (from /trunk/tests/test.py:270)
   R /branches/richard-glx-version/tools/info.py (from /trunk/tools/info.py:272)
   R /branches/richard-glx-version/website/get_involved.php (from /trunk/website/get_involved.php:273)

Branching to horribly mangle GLX
 2008-12-06 20:10:31 +01:00
Patrick Mezard
7c5f958561 Rewrite svn tests using svndump 
They are:
- faster to run (12s vs 30s in test-convert-svn-branches case)
- easier to craft
- easier to debug
- more portable
 2008-12-06 20:07:44 +01:00
Benoit Boissinot
dd2edb030b use repr() instead of backticks 2008-12-06 15:37:15 +01:00
Jim Hague
4c1c67e78b Fix test-acl failure on AIX due to read only LOGNAME. 
On AIX /etc/profile sets LOGNAME read only. This causes test-acl to
fail when it comes to set LOGNAME in do_push().

Work around this by using env to set LOGNAME and run the command.
 2008-12-04 13:42:47 +00:00
Augie Fackler
1edb8ec992 rebase: add support to keep branch names 
Callback on extra fields added by Patrick Mezard <pmezard@gmail.com>.
 2008-11-18 21:46:01 -06:00
Frank Kingswood
a411f7bf3c tests: allow cvs import to reorder its filename list 
Also fix script to generate non-zero length test file b.
 2008-12-01 13:42:04 +00:00
Benoit Boissinot
2d2f786bc1 re-add +x bit for test-convert-darcs (was missing from 82f475165077) 2008-12-03 01:28:33 +01:00
Benoit Boissinot
e5063ce27a push: use the fast changegroup() path on push 
The race doesn't happen on push (because the discovery is done
in the same hg process), so use the fast path instead.
 2008-12-02 19:36:43 +01:00
Brodie Rao
f47cc3cffa color: replace effect-specific reset control codes with general purpose one 2008-12-01 10:45:22 -05:00
Augie Fackler
f781793820 color: Add tests for colorized diff and status output. 2008-12-02 10:13:52 -06:00
Patrick Mezard
9b8cb99ec1 hgweb: extend [paths] syntax to match repositories recursively (issue852) 
This feature somehow duplicates [collections] but it is simpler to use and has
less issues under Windows where using absolute path as configuration file key
is not supported.

Suggested by Dirkjan Ochtman <dirkjan@ochtman.nl>
 2008-12-01 14:20:20 +01:00
Thomas Arendsen Hein
94a7bf7e03 Fix non-empty $CDPATH causing failed tests. 
If CDPATH contains '.', every cd command prints the target path,
which causes additional output in tests and makes them fail.
 2008-12-01 12:11:28 +01:00
Dirkjan Ochtman
92de1e35e4 gitweb: fix graph again after previous faulty commit (e5b968ed257a) 2008-11-30 18:38:42 +01:00
Dirkjan Ochtman
55a235cc5e gitweb: fix graph display in IE 2008-11-28 09:50:30 +01:00
Brendan Cully
1b764744f0 Fix test breakage introduced in e96c889402b8 2008-11-27 11:14:43 -08:00
Brendan Cully
010e2cdb2d Add hgcia to hgext 2008-11-27 11:04:29 -08:00
Dirkjan Ochtman
221c2c31df tests: fix test results for e96c889402b8 2008-11-27 18:46:45 +01:00
Dirkjan Ochtman
9bf5b2380e diff: fix obscure off-by-one error in diff -p 2008-11-27 17:00:54 +01:00
Benoit Boissinot
7c64bcb65d merge with mpm 2008-11-27 01:35:12 +01:00
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