Commit Graph

1058 Commits

Author SHA1 Message Date
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
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
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
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