facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 16:31:02 +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
c40b8bf294 cvsnt-mergepoints test: use sh instead of bash 2009-05-17 02:10:09 +02:00
Martin Geisler
aedc0ac57f tests: removed unnecessary execute bit on Python tests 2009-05-17 01:42:21 +02:00
Martin Geisler
a645da9ed1 tests: renamed Python tests to .py 2009-05-17 01:39:31 +02:00
Martin Geisler
5930e2185d tests: renamed helper to avoid clash with stdlib repr module 2009-05-17 02:31:12 +02:00
Martin Geisler
9aedf5dabd tests: fix doc string in get-with-headers.py 2009-05-17 01:24:45 +02:00
Marti Raudsepp
1d10c4d979 tests: use repr.py to avoid binary characters in test output 2009-05-17 01:16:56 +02:00
Martin Geisler
4bdb838b6b tests: new helper for tests with binary output 2009-05-17 01:10:35 +02:00
Martin Geisler
fc8a97dac3 changelog: refuse to add revisions with empty usernames 
An empty username or a username with a "\n" will make the revision
text contain two "\n\n" sequences -> corrupt repository.

The problem is that changelog.read expects to find exactly one "\n\n"
separator and thus cannot unpack the revision.
 2009-05-16 11:12:49 +02:00
Patrick Mezard
d3d9100f4a convert/bzr: fix symlinks target (issue1626/2) 2009-05-15 16:12:09 +02:00
Martin Geisler
f138e91851 merge with crew-stable 2009-05-16 11:16:23 +02:00
Patrick Mezard
8a575f0b78 Merge with crew-stable 2009-05-15 16:17:56 +02:00
Dirkjan Ochtman
1e9b20dc8f mq: qpush shouldn't complain if working dir is at a non-tip head 2009-05-15 15:21:17 +02:00
Brett Carter
d69cd3912f clone: try updating to the actual changeset specified in options 
When cloning with the -r option or # url format from a tag the destination
repo most likely won't have the tag. We can save the lookup result to get to
the correct parent anyway. Similar to issue1306, but for tags.
 2009-05-14 22:00:56 +02:00
Matt Mackall
fa65ae0679 remove deprecated rawcommit 2009-05-14 13:20:40 -05:00
Peter Arrenbrecht
35e8011b63 verify: detect manifest revs not in any changeset 2009-05-14 16:22:49 +02:00
Martin Geisler
2dec1cac72 test-debugcomplete: add --show merge option to output 2009-05-14 17:28:26 +02:00
Dirkjan Ochtman
2f19dcd8ee merge: add -S/--show option to review revisions without merging 2009-05-14 16:03:17 +02:00
Martin Geisler
a231ff4f38 highlight: updated changed test output 
It was changed in 00697060e4d8, but I forgot to update it.
 2009-05-14 13:21:47 +02:00
Michael J. Pedersen
5874aad1d7 convert: adding branchmap functionality to convert extension 2009-05-13 15:03:31 -04:00
Martin Geisler
e03fc942e6 spartan: break long lines in map file 2009-05-13 22:42:40 +02:00
Martin Geisler
80ce65be72 gitweb: break long lines in map file 2009-05-13 22:41:58 +02:00
Martin Geisler
264d2453c3 paper: break long lines in map file 2009-05-13 22:40:49 +02:00
Rocco Rutte
a7d36bb777 coal/paper: Wrap diff in <pre/> 
In text-mode browsers the diff is otherwise rendered
as just one long line per file. Other styles do the same.
 2009-05-13 16:31:19 +02:00
Dirkjan Ochtman
9b104a6a4a mq: add -P/--push option to qimport 2009-05-12 11:15:54 +02:00
Dirkjan Ochtman
6f7f8e3dec templater: make the templating engine pluggable to some extent 2009-05-12 12:05:19 +02:00
Dirkjan Ochtman
ffa181f4fd tests: add test for branches webcommand 2009-05-12 11:05:13 +02:00
Sune Foldager
e88b228e4c spartan: add branches page 2009-05-12 11:58:39 +02:00
Sune Foldager
ffb22da91d paper/coal: add branches page 2009-05-12 12:00:54 +02:00
Rocco Rutte
4ed7542551 test-patchbomb: fix style 
Specifying revisions without -r is deprecated, break long lines.
 2009-05-12 11:27:26 +02:00
Martin Geisler
aa4858058d tests: avoid export FOO=bar bashism 2009-05-11 23:42:03 +02:00
Martin Geisler
ccf16e42d8 record: better formatting for qrecord help 2009-05-10 01:18:38 +02:00
Alexander Solovyov
d57b80d44e add verbose output to compact template style 2009-05-11 13:03:34 +03:00
Sune Foldager
4a665141b4 allow http authentication information to be specified in the configuration 2009-05-04 20:26:27 +02:00
Rocco Rutte
00891e0e67 patchbomb: quoted-printable encode overly long lines 
RfC2822 mandates a line length limit of 998 byte + CRLF.
Python mail tools break lines at 990 byte. To prevent
that, we quoted-printable encode overly long lines.
 2009-05-08 18:30:44 +02:00
Mads Kiilerich
61b324eeb6 test-glog: Remove sed hack - '...$HGTMP...' isn't expanded anyway 2009-05-02 12:57:20 +02:00
Mads Kiilerich
9a2371955d test-convert-baz: hide GNU tar deprecation warning 2009-05-02 12:13:24 +02:00
Patrick Mezard
832313e290 rebase: fix bug where --keepbranches could leave wrong branch in dirstate 
Report and original fix by Augie Fackler <durin42@gmail.com>
 2009-05-01 12:26:37 +02:00
Patrick Mezard
bd41c37f9b convert/svn: keep latest and not oldest tag value 2009-04-29 21:44:25 +02:00
Martijn Pieters
0a6e43e789 Fix typeerror when specifying both --rebase and --pull 2009-04-29 11:39:49 +02:00
Matt Mackall
ee9ffff851 Merge with crew-stable 2009-04-26 16:49:47 -05:00
Patrick Mezard
ccca7abe8e convert/bzr: make it work with filemaps (issue1631) 
The bzr converter maintains a child -> parents mapping and drop entries
whenever a child is read. It does not work with filemaps, getchangedfiles() may
be called more than once when filtered files belong to merge revisions.
getchanges() still works that way but it is not clear whether a similar issue
can arise when interacting with merges.
 2009-04-26 11:35:53 +02:00
Patrick Mezard
62eea60737 convert/bzr: fix symlink handling (issue1626) 2009-04-24 10:34:11 +02:00
Matt Mackall
5c870ca09d Merge with crew-stable 2009-04-23 15:25:27 -05:00
Patrick Mezard
75233223fe convert/bzr: handle files replaced by directories (issue1623) 2009-04-23 15:07:05 +02:00
Patrick Mezard
f7e8a4c038 convert/mtn: handle directory move into moved directory (issue1619/3) 2009-04-22 10:25:05 +02:00
Patrick Mezard
6bbead8918 convert/mtn: handle files moved in a moved directory (issue1619/2) 2009-04-21 22:31:16 +02:00
Matt Mackall
e612ed45dd Merge with crew-stable 2009-04-21 12:53:06 -05:00
Patrick Mezard
551e0cf361 convert/mtn: handle new files in moved directories (issue1619) 
Reported and investigated by Paul Aurich <paul@darkrain42.org>
 2009-04-21 14:17:29 +02:00
Matt Mackall
56cd5d40bb Merge with crew-stable 2009-04-17 11:16:50 -05:00
Patrick Mezard
0d13db37f7 extdiff: preserve execute-bit across copies (issue1562) 
Bug report and test by Mads Kiilerich <mads@kiilerich.com>
 2009-04-09 14:32:44 +02:00
Patrick Mezard
b3f0d7b5b8 convert/p4: win32 fixes 
* cmd.exe does not know single quotes
* win32 does not like trailing whitespace very much. Trade test coverage for
  maintenance time and drop the trailing whitespaces tests.
 2009-04-13 16:15:45 +02:00
Patrick Mezard
3ca6ee213a test-issue1438: make executable 2009-04-13 21:18:53 +02:00
Patrick Mezard
0dbcb77e35 convert/mtn: record changes from directory renames (issue1587) 
Bug report and initial path by Pavel Volkovitskiy <int@mtx.ru>
 2009-04-11 23:12:42 +02:00
Augie Fackler
00f768d1f1 test-convert-svn-sink: rewrite output for svn compatibility 
Addition by Patrick Mezard <pmezard@gmail.com>:
* drop 'kind=' lines from svn 1.6 output
 2009-04-04 20:39:46 -05:00
Patrick Mezard
2ae17cf19b convert/bzr: fix file rename replaced by a dir case (issue1583) 
We were not checking entry types, and getting file content was working with
directories instead of raising IOError.
 2009-04-11 20:18:51 +02:00
Patrick Mezard
1e07615a4a test-convert-bzr: check renamed files are removed (issue1505) 2009-04-08 23:17:33 +02:00
Benoit Boissinot
e5ea532970 raise RevlogError when parser can't parse the revlog index 
Initial patch and test thanks to Nicolas Dumazet.
 2009-04-06 19:48:11 +02:00
Dmitriy Kostunin
913ecbba5c inotify: adding test for issue1556 2009-03-31 00:04:07 +09:00
Greg Ward
47d2411255 issue1577: fix broken test by assuming less about CVS output. 
Specifically, output of "cvs ci" varies unpredictably across CVS versions,
so any test that includes the output of "cvs ci" is doomed to fail
some of the time.  This fixes that by discarding the output of "cvs ci".
 2009-03-28 12:24:53 -04:00
Sverre Rabbelier
1c34b4064b commit: be more verbose in the -u help text 
Make the requirement of an argument for -u a little more explicit.
 2009-05-08 16:30:51 +02:00
Greg Ward
5485b0d573 test-convert-bzr: tweak sed hack to preserve timezone in 'bzr log' output 2009-05-07 21:35:12 -04:00
Martin Geisler
c6d62b90de test-convert-bzr: use sed instead of awk 
The run-tests.py script has a list of required tools and awk is not
one of them -- luckily it could be replaced by sed in this case.
 2009-05-07 19:02:39 +02:00
Greg Ward
ccfd8df373 convert/bzr: handle Bazaar timestamps correctly (issue1652). 2009-05-06 17:48:03 -04:00
Martin Geisler
6533e94352 util: remove md5 
This hash function is broken and should not be used by new code. It is
currently only used by keepalive.
 2009-05-04 21:30:39 +02:00
Henrik Stuart
d0b7d204d4 transaction: refactor transaction.abort and rollback to use the same code 
This adds a change to the way that abort is processed, as it will not continue
truncating files beyond the first failure, otherwise the respective
functionality is maintained, i.e. abort will not unlink files, but rollback
will.

Co-contributor: Sune Foldager <cryo@cyanite.org>
 2009-05-04 15:31:57 +02:00
Henrik Stuart
b0183e01a2 test: change repair strip test to illustrate manifest errors 2009-05-04 13:47:12 +02:00
Benoit Boissinot
fdd0aa0449 verify: reference the correct linkrev when a filelog is missing 
when a filelog is missing, the first bad revision is the first revision
where the filelog is referenced, not 0.
 2009-05-04 19:51:08 +02:00
Patrick Mezard
8636bd4633 Merge with crew-stable 2009-05-03 13:49:04 +02:00
Martin Geisler
11190d5aaa util: always use subprocess 2009-05-02 23:05:35 +02:00
Richard Quirk
1652c239fa Add committer tag only when needed in git conversion 
Convert from a git repo added a committer: tag in the log message
even if the committer and the author were the same person.
 2009-05-01 11:32:19 +02:00
Patrick Mezard
c620d68ecc Merge with crew-stable 2009-05-01 12:35:13 +02:00
Bryan O'Sullivan
092a707d59 run-tests.py: ensure that hgpkg is always visible 2009-04-24 14:40:56 -07:00
Martin Geisler
9302c79c56 churn: use .hgchurn in repo root as default map file 2009-04-29 20:03:54 +02:00
Greg Ward
8e956c0016 Reproduce crash where synthetic revs break merge detection (issue1578). 
(The fix for this was committed as ca297bc0642d.)

Slightly edited by Patrick Mezard <pmezard@gmail.com>
 2009-04-18 13:29:48 -04:00
Patrick Mezard
a623c855d8 Merge with crew-stable 2009-04-29 21:48:15 +02:00
Martijn Pieters
be04752b60 Don't use sed -r; instead use old-style regexp 
Rev 428419380b9f introduced some sed -r tests, but -r is only available on GNU
sed, while BSD sed uses -E. Better to use old-style regular expressions, that
way the tests work on all sed variants.
 2009-04-28 17:17:54 +02:00
Martijn Pieters
03d5e1ec41 Fix typeerror when specifying both --rebase and --pull 2009-04-29 11:39:49 +02:00
Martin Geisler
eee44d410e webcommands: move nonempty logic from JavaScript to Python 
This avoids hard-coding the '(none)' string in the JavaScript for each
style and avoids the {nonexisting|nonempty} hack which only works
since the template system don't complain about undefined variables.
 2009-04-28 17:28:00 +02:00
Rocco Rutte
0324c58f8b hgweb: use "nonempty" filter in templates for the changelog message 
At least subversion allows empty commit logs which, after conversion,
show up as empty fields in hgweb and don't allow selecting the
changeset. Using "nonempty" as filter, "(none)" is used to get
clickable links for empty commit messages.
 2009-04-20 12:10:04 +02:00
Martin Geisler
750183bdad updated license to be explicit about GPL version 2 2009-04-26 01:08:54 +02:00
Dirkjan Ochtman
80de6974e4 more whitespace cleanup and some other style nits 2009-04-27 12:37:19 +02:00
Dirkjan Ochtman
9acb549bd6 tests: add tests for styled hgwebdir pages 2009-04-27 11:35:18 +02:00
Patrick Mezard
a001fce5fc hghave: handle Windows raising on popen() failure 2009-04-26 19:39:15 +02:00
Patrick Mezard
48f64be1f8 test-extdiff: replace shell script with python for portability 2009-04-26 19:26:22 +02:00
Patrick Mezard
caba144775 Declare bzr TERM=dumb to silence progress bars 
In theory, one could set BZR_PROGRESS_BAR=none but it does not work in 1.14rc2
 2009-04-26 18:36:36 +02:00
Matt Mackall
2f9b02c62d replace util.sort with sorted built-in 
This is marginally faster for small and moderately-sized lists
 2009-04-26 16:50:44 -05:00
Matt Mackall
efc3ded95f ui: report_untrusted fixes 
- report_untrusted -> _reportuntrusted
- only report config shadows if enabled
- config shadows are debug messages
 2009-04-26 16:50:44 -05:00
Matt Mackall
be7d59ab85 ui: kill most users of parentui name and arg, replace with .copy() 2009-04-26 16:50:43 -05:00
Matt Mackall
88b13fecec ui: replace parentui mechanism with repo.baseui 2009-04-26 16:50:43 -05:00
Matt Mackall
68db339c4b clone: config escaping no longer needed 2009-04-26 16:50:43 -05:00
Martijn Pieters
4abe231925 hg: allow hg.parseurl(url, None) 
In many places hg.parseurl is called with a url and "opts.get('rev')",
suggesting the second, optional argument can be None. Because opts['rev']
usually defaults to [] this never happens in practice.

However, extensions don't necessarily behave the same, but do copy this
pattern.

Also, include wider hg.parseurl tests, beyond a demonstration of the problem.
 2009-04-24 18:17:42 +02:00
Jacob Lee
9dd517638d transplant: remove the restriction that the destination be nonempty. 
Test fixed by Patrick Mezard <pmezard@gmail.com>
 2009-04-24 17:00:18 -05:00
Greg Ward
c5b50c8953 cvsps: fix crash when log message refers to non-existent branch (issue1615). 2009-04-19 13:12:20 -04:00
Greg Ward
a7ab6b3c51 cvsps: add test for merge detection (issue1615). 
Currently only testing convert.cvsps.mergefrom; this script should also
probably test convert.cvsps.mergeto.
 2009-04-19 12:20:39 -04:00
Patrick Mezard
71875461a3 convert/cvs: add an option to disable remote log caching 
Useful for debugging or testing when using --tmpdir.
 2009-04-26 16:30:37 +02:00
Martin Geisler
d850e0459d tests: removed redundant "-u test" from test scripts 
The tests are executed with a .hgrc file which adds "-u test" by
default.
 2009-04-26 14:49:49 +02:00
Martin Geisler
65537ad291 tests: removed redundant "-d '0 0'" from test scripts 
The tests are executed with a .hgrc file which adds "-d '0 0'" by
default.
 2009-04-26 14:29:02 +02:00
Patrick Mezard
eb5b6f47f6 Merge with crew-stable 2009-04-26 11:49:17 +02:00
Simon Heimberg
36693ceb6a run-tests: cosmetics 2009-04-22 15:49:33 +02:00
Henrik Stuart
54d1e80807 patchbomb: add user agent header to mails 2009-04-23 08:39:27 +02:00
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