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

1293 Commits

Author SHA1 Message Date
Patrick Mezard
8169b36e09 Merge with crew-stable 2007-08-14 19:30:14 +02:00
Patrick Mezard
e1556e1cd2 hghave: test hotshot dependencies (debian does not provide profile) 2007-08-14 19:25:49 +02:00
Patrick Mezard
f54fb44413 Merge with crew-stable 2007-08-14 19:06:10 +02:00
Patrick Mezard
3f797895fa test-profile: fix grep, check hotshot availability 2007-08-14 18:53:45 +02:00
Patrick Mezard
1c4c581aa9 Merge with crew-stable 2007-08-14 16:30:38 +02:00
Patrick Mezard
0e4dfe7a43 Test --time, --profile and --lsprof 2007-08-14 16:27:35 +02:00
Alexis S. L. Carvalho
a866998db8 merge with crew-stable 2007-08-12 12:43:52 -03:00
Alexis S. L. Carvalho
664fc9f5dd merge: fix a copy detection bug (issue672) 
When merging rev1 and rev2, we want to search for copies that happened
in rev1 but not in rev2 and vice-versa.  We were starting the search at
rev1/rev2 and then going back, stopping as soon as we reached the revno
of the ancestor, but that can miss some cases (see the new
test-issue672).

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

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

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

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

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

This should probably be improved in the future to handle long-living
branches, as joining two "other" heads will switch to that new head.
But this is not a new problem, as adding to the "other" head would have
switched to that new head, too.
 2007-08-06 20:25:50 +02:00
Patrick Mezard
6b51a27d18 Merge with crew-stable 2007-08-06 10:57:51 +02:00
Patrick Mezard
ddd22af442 test-oldcgi: replace shebangs with explicit python calls to help pysh. 2007-08-06 09:57:23 +02:00
Patrick Mezard
2a6ceeedcb test-issue352: skip tests if platform does not support EOL in paths. 2007-08-06 09:57:23 +02:00
Patrick Mezard
500ee24e06 hghave: detect support for EOL in paths. 2007-08-06 09:57:23 +02:00
Patrick Mezard
055f422fdd test-git-import: fake executable permissions. 2007-08-06 10:38:07 +02:00
Patrick Mezard
57942c16c7 hghave: detect executable permission availability. 2007-08-06 10:26:04 +02:00
Patrick Mezard
5346057af9 test-clone-failure: fake output upon fifo unavailabity 2007-08-06 09:57:23 +02:00
Patrick Mezard
27b87366de hghave: detect FIFO availability 2007-08-06 09:57:23 +02:00
Patrick Mezard
b04f418b92 Skip test-archive-symlinks if symlinks are not available 2007-08-06 09:57:23 +02:00
Alexis S. L. Carvalho
9107d93d2f merge with crew-stable 2007-08-06 01:00:10 -03:00
Alexis S. L. Carvalho
56d1444a26 httprepo: quote the path part of the URL 
This should fix a 'hg clone "http://hg.example.org/path with spaces/"'

The code tries to do the right thing when the user passes a path that's
already escaped in part (e.g. "http://hg.example.org/path%20with spaces/").

If we're redirected, urllib2 will happily follow the URL it's given
without escaping anything.  I'm not sure what we would have to hook
to work around that.
 2007-08-06 00:35:06 -03:00
Alexis S. L. Carvalho
502ca449fe dirstate: fix rebuild; add a test 
If rebuild calls invalidate, it will just queue a (re)read of the dirstate
file, while what we really want is to empty the current state.
 2007-08-05 23:04:56 -03:00
Brendan Cully
7bd6f8b503 patch: add git symlink support 2007-08-04 23:07:52 -07:00
Brendan Cully
8b26a09d27 imerge: gussy up dispatcher to support subcommand opts. 
Add -n, --resolved, --unresolved to status.
 2007-08-04 12:26:48 -07:00
Brendan Cully
6f2a9d642d Merge with crew 2007-08-04 09:33:10 -07:00
Brendan Cully
9fa1148786 imerge: handle renames 2007-08-03 18:05:20 -07:00
Matt Mackall
f5270b4251 Merge with -stable 2007-08-02 13:23:53 -05:00
Matt Mackall
2cee92939f merge: avoid double deletion mentioned in issue636 2007-08-02 12:29:10 -05:00
Thomas Arendsen Hein
7f36ffc2b5 The >| redirection does not exist in plain sh. 2007-08-02 14:51:49 +02:00
Thomas Arendsen Hein
ab1cf115c1 The >| redirection does not exist in plain sh. 2007-08-02 14:51:49 +02:00
Alexis S. L. Carvalho
6aba65ae68 update tests output 2007-08-02 01:56:08 -03:00
Brendan Cully
fc8076b99a Merge with mpm 2007-08-01 14:26:30 -07:00
Matt Mackall
600c42bfbf Merge with stable 2007-08-01 14:03:48 -05:00
Brendan Cully
dbb657852c imerge extension and test 2007-08-01 11:37:11 -07:00
Matt Mackall
d76c06eeb0 merge: do early copy to deal with issue636 
Without copies/renames, merges source names are 1:1 with their
targets. Copies and renames introduce the possibility that there will
be two merges with the same input but different output. By doing the
copy to the destination name before the merge, the actual merge
becomes 1:1 again, and no source is the input to two different merges.

- add a preliminary scan to applyupdates to do copies
- for the merge action, pass the old name (for finding ancestors) and
  the new name (for input to the merge) to filemerge
- eliminate the old post-merge copy
- lookup file contents from new name in filemerge
- pass new name to external merge helper
- report merge failure at new name
- add a test
 2007-08-01 12:33:12 -05:00
Thomas Arendsen Hein
c6fa90f553 Update style of record's cmdtable to match mercurial/commands.py 2007-08-01 10:42:42 +02:00
Bryan O'Sullivan
a79766b2cd Add record extension, giving darcs-like interactive hunk picking 2007-07-31 16:28:05 -07:00
Bryan O'Sullivan
d761a6e964 Update expected test output 
It's no longer a "problem" to have the same name listed with no prefix
and a "hgext." prefix.
 2007-07-30 20:48:50 -07:00
Thomas Arendsen Hein
1640028059 merge with crew-stable 2007-07-30 20:06:11 +02:00
Thomas Arendsen Hein
c8e49d5f09 Fix re: and glob: patterns in .hgignore (reported by Brad Schick) 
relglob: and relre: were already detected for a long time, so
I kept this undocumented functionality, especially as it was already
tested in test-hgignore.
 2007-07-30 20:01:16 +02:00
Thomas Arendsen Hein
c5409343d1 test-convert: Hide warning about missing subversion bindings. 2007-07-29 19:32:55 +02:00
Thomas Arendsen Hein
8778149e15 Fix bashism and remove useless use of cat. 2007-07-29 18:53:09 +02:00
Patrick Mezard
55cd10d565 Test qnew --git 2007-07-28 20:15:54 +02:00
Bryan O'Sullivan
8cd3c03796 convert: make test-convert executable 2007-07-26 14:08:39 -07:00
Bryan O'Sullivan
0242a99204 convert: add test 2007-07-26 13:34:36 -07:00
Matt Mackall
3dfe783ec5 transactions: avoid late tear-down (issue641) 
We use weak references (ugh) to avoid having to manually delete
transaction references out of each call frame when an exception occurs.
 2007-07-22 14:53:57 -05:00
Thomas Arendsen Hein
b35814d4c2 merge with crew-stable 2007-07-22 09:45:18 +02:00
Bryan O'Sullivan
a09e8936ae addremove: print meaningful error message if --similar not numeric 2007-07-21 19:07:18 -07:00
Matt Mackall
cd72dc7f1b Merge with crew 2007-07-21 16:44:38 -05:00
Matt Mackall
3fdaa5a42e Use a weakref for recursive transactions 2007-07-21 16:02:10 -05:00
Alexis S. L. Carvalho
e0b6efcdbf help: avoid traceback if an extension has only debug commands 2007-07-19 19:43:25 -03:00
Alexis S. L. Carvalho
a8e3b41c40 merge with crew-stable 2007-07-19 19:48:24 -03:00
Thomas Arendsen Hein
0fccb9b2ae merge with crew-stable 2007-07-18 16:46:01 +02:00
Thomas Arendsen Hein
085838b3dc fix test-tag on Solaris 2007-07-18 16:41:45 +02:00
Bryan O'Sullivan
bbc8c72100 Update test output to reflect small changes in patch chattiness. 2007-07-17 09:39:30 -07:00
Alexis S. L. Carvalho
ae58d97874 merge with crew-stable 2007-07-17 09:28:01 -03:00
Alexis S. L. Carvalho
4770c831b2 hg parents: don't pass an OS-specific path to repo.filectx 
The only reason to use the matcher code instead of calling util.canonpath
directly is to be able to use "path:canonical/path/to/file" patterns.
 2007-07-17 09:08:29 -03:00
Bryan O'Sullivan
c824069322 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) 
This also fixes an asymmetry bug in which we called the pretag hook if we
were going to create a local tag, but didn't call the tag hook afterwards.
 2007-07-16 20:15:03 -07:00
Bryan O'Sullivan
39c3672fd0 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) 
This also fixes an asymmetry bug in which we called the pretag hook if we
were going to create a local tag, but didn't call the tag hook afterwards.
 2007-07-16 20:15:03 -07:00
Bryan O'Sullivan
e2e04c39f7 issue 622: pull/unbundle -u updates to default branch if repo was empty 2007-07-16 18:01:20 -07:00
Bryan O'Sullivan
ef448328f7 issue 622: pull/unbundle -u updates to default branch if repo was empty 2007-07-16 18:01:20 -07:00
Bryan O'Sullivan
e1c7de520a mq: autodetect an existing git patch during qrefresh (issue 491) 2007-07-16 16:50:47 -07:00
Bryan O'Sullivan
3ab73cd145 mq: autodetect an existing git patch during qrefresh (issue 491) 2007-07-16 16:50:47 -07:00
Patrick Mezard
afa316b160 Merge with crew-stable. 2007-07-15 14:57:20 +02:00
Patrick Mezard
9ce0928703 test-symlink-basic: require symlinks availability 2007-07-15 14:09:56 +02:00
Matt Mackall
86ab3ea033 Merge with -stable 2007-07-14 13:34:40 -05:00
Matt Mackall
6a7cb8cbaa diff: correctly handle combinations of whitespace options 2007-07-14 12:44:47 -05:00
Patrick Mezard
a17aa86e69 Add hghave utility and run-tests.py support. 
hghave detects system features like symlinks availability at run-time. Tests can be skipped by starting them with:

"$TESTDIR/hghave" symlink || exit 80

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

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

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

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

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

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

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

- permissions for a file have changed;

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

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

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

Patch and test case provided by Benoit.

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

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

One minor problem:
As only the needed changesets are transfered and stored in a local bundle
repository, the tip tag of this bundle is shows despite not being the tip
changeset of the remote repository.
(see "+tag: tip" in tests/test-incoming-outgoing.out in this patch)
 2007-06-01 19:45:05 +02:00