Commit Graph

4567 Commits

Author SHA1 Message Date
Matt Mackall
ca599a1af2 alias: fix up test results 2011-07-18 14:53:52 -05:00
Matt Mackall
5ce8f05f45 dispatch: move shell alias handling after early arg handling
--cwd, --repo, and --config obviously should be handled first
2011-07-15 16:06:53 -05:00
Matt Mackall
6353a59044 merge with stable 2011-07-15 14:27:16 -05:00
Stefano Tortarolo
80ea985fc0 rebase: reset bookmarks (issue2265 and issue2873) 2011-07-15 20:07:19 +02:00
Matt Mackall
9da252ada5 merge with stable 2011-07-15 12:56:58 -05:00
Idan Kamara
bab89cfab6 cmdserver: take repo.baseui as our ui
The ui passed to server() is really repo.ui, that is it contains its local
configuration as well.

When running commands that use a different repo than the servers cached repo,
we don't want to use that ui as the baseui for the new repo.
2011-07-14 11:46:15 +03:00
Idan Kamara
d17c3e4003 test-commandserver: explicitly close opened file 2011-07-15 16:28:09 +03:00
Matt Mackall
5ad9027afd merge with stable 2011-07-13 19:27:56 -05:00
Matt Mackall
c78a7611d4 subrepo: use working copy of .hgsub to filter status (issue2901) 2011-07-13 17:41:49 -05:00
Matt Mackall
5d114db2de merge with crew 2011-07-13 19:24:54 -05:00
Matt Mackall
4773ae257d merge with stable 2011-07-13 16:29:28 -05:00
Patrick Mezard
b4b683d9b9 test-notify-changegroup: test notifications on unbundle 2011-07-13 19:23:12 +02:00
Patrick Mezard
f7c5a41400 run-tests: fix summary when accepting changes interactively
Accepted changes were not counted as success.
2011-07-13 19:23:08 +02:00
Matt Mackall
107896d6aa merge with stable 2011-07-12 16:27:03 -05:00
Idan Kamara
550bca7579 cmdserver: restore old working dir after dispatch when we have --cwd 2011-07-11 17:49:45 +03:00
Cédric Krier
acde2a727f hgcia: Set default value of strip to -1 (issue2891)
For backward compatibility the root path of the repository is not
displayed unless the user has specified an explicit strip value.
2011-07-09 09:44:15 +02:00
Martin Geisler
d1589aefcc commands: improve help for -y/--noninteractive
Before, the help text said that Mercurial would assume 'yes' for all
prompts, but this is confusing since many prompts don't have any 'yes'
choice. It now more accurately describes what will happen.
2011-07-07 10:32:30 +02:00
Matt Mackall
b06b887ee8 discovery: quiet note about heads
This was changing output on in/out -v for no good reason.
2011-07-05 14:30:42 -05:00
Wagner Bruna
56657ac28b patch: fix parsing patch files containing CRs not followed by LFs
Since 75e6e3c16f9c , patch lines containing a CR not followed by a LF
would be incorrectly splitten, causing a failure to apply the patch.
2011-07-04 19:53:39 -03:00
Jim Hague
f6f49b778c treediscovery: rename stop() in tests to fix failures on AIX.
It seems ksh, the default shell on AIX, does not permit the creation of a
function called stop(). test-treediscovery.t and test-treediscovery-legacy.t
both fail on AIX with error 'syntax error at line 25 : `(' unexpected'.

Fix by renaming stop() in the scripts to tstop(). For completeness
rename start() to tstart() to match. Both tests then pass on AIX.

Add check for the use of stop() in a shell script to check-code.
2011-07-05 11:53:32 +01:00
Stepan Koltsov
a47a7047c8 eol: fix missing trailing newlines in comitted files
Some text editors (Eclipse, for example) do not add trailing newlines,
so diffs often contain annoying "\ No newline at the end of file".
This patch to eol extension simply adds trailing newline on commit.
2011-07-01 23:12:52 +04:00
Stepan Koltsov
8ad66e155c eol: eol.only-consistent can now be specified in .hgeol 2011-07-01 22:53:58 +04:00
Martin Geisler
8b87ff203b merge with stable 2011-07-07 10:34:19 +02:00
Martin Geisler
364d063687 commands: use mergetoolopts when a command supports --tool 2011-07-07 10:19:37 +02:00
Pierre-Yves David
31fc6f84be bookmarks: add a warning for non empty malformed line 2011-07-05 10:20:27 +02:00
Pierre-Yves David
5984ee96d7 bookmarks: more robust parsing of bookmarks file 2011-07-05 10:13:54 +02:00
Mads Kiilerich
14ac790472 tests: restore previous fix for date ambiguity in cvs test
30db4b71a82e changed some sleeps after cvs update to sleeps before commit. I
don't know why that should work, but I have a machine where it doesn't work.
Commits regularly fails becuase cvs doesn't notice that a file has been
changed.

Restoring the previous sleep between the update and the edit makes cvs notice
the change.
2011-07-01 18:13:48 +02:00
Thomas Arendsen Hein
0b341ae9aa run-test: revert most of 723925f3994b, timeout uses fallback for terminate() 2011-06-30 16:36:38 +02:00
Thomas Arendsen Hein
3453fd49fa run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() 2011-06-30 16:25:05 +02:00
Eli Carter
8827c54a9a subrepo: correct revision in svn checkout
A Subversion subrepo checkout uses a url and --revision which does not do the
correct thing when specifying a revision of a branch that has since been
deleted and recreated.  The checkout needs to specify the revision as URL@REV
instead.
2011-06-30 13:22:12 -05:00
Idan Kamara
02ffbb9696 tests: add basic commandserver test 2011-06-29 15:49:35 +03:00
Adrian Buehlmann
13cd3f341f test-revert: add revert --all case when nothing changed
supposed to succeed without notice
2011-06-28 00:56:33 +02:00
Thomas Arendsen Hein
e2aeb2930a test-wireprotocol.py: rename to test-wireproto.py for consistency
1. The module named 'wireproto' is tested.
2. There already is a test-wireproto.t for related tests on shell level.
2011-06-29 13:04:00 +02:00
Thomas Arendsen Hein
692a53d202 classes: fix class style problems found by 06e968819ac9
This makes test-wireprotocol.py work on Python 2.4
2011-06-29 15:00:00 +02:00
Thomas Arendsen Hein
4575d54a81 check-code: fix class style checking (with tests)
- old-style classes were only checked for one-letter class names
- add check for new-style classes with empty parent class, because
  this is not available in Python 2.4
2011-06-29 13:45:51 +02:00
Mads Kiilerich
1b1811c0d4 tests: ignore inotify extension in test-duplicateoptions.py
The inotify extension is only available on linux and setup.py will not install
it on other platforms - but it will of course always be there in the source.

test-duplicateoptions.py tried to load most extensions (including inotify if
available). When the local uninstalled Mercurial was used it would thus always
load the inotify extension and cause a warning on unsupported platforms.

The inotify extension is not relevant for this test, so now we explicitly
ignore it.
2011-06-29 00:19:27 +02:00
Danek Duvall
20a33c579c tests: hardcode terminfo entry for the terminfo color test
For the terminfo color test, make sure that the terminfo entry used is one
of our own choosing, by delivering a special "hgterm" entry (a copy of
ncurses' xterm-color), compiling it, and specifically pointing curses to it
using the TERMINFO and TERM environment variables.  This means we can
ignore the variability in different terminal definitions on different
platforms.
2011-06-27 11:36:40 -07:00
Adrian Buehlmann
9b3812c8c6 revert: improve hints on abort when reverting to parent without --all
BEFORE:

    $ hg revert
    abort: no files or directories specified
    (use --all to discard all changes)

AFTER:

  Uncommitted changes (using --all *will* nuke edits):

    $ hg revert
    abort: no files or directories specified
    (uncommitted changes, use --all to discard all changes)

  Clean working directory (using --all won't discard anything):

    $ hg revert
    abort: no files or directories specified
    (use --all to revert all files)
2011-06-26 01:13:30 +02:00
Idan Kamara
ff97debbbd dispatch: make sure unspecified global ui options don't override old values 2011-06-24 12:16:14 +03:00
Pierre-Yves David
2ebc0660c3 requirements: show all missing features in the error message.
Displaying all missing featureis help people to solve the issue (choosing the
right version, creation the right repo)
2011-06-25 02:30:24 +02:00
Adrian Buehlmann
bb2cb4edc9 test-revert: add case for nothing changed 2011-06-24 23:29:51 +02:00
Mads Kiilerich
2c9adcac85 tests: solaris [ doesn't know -e 2011-06-25 01:55:16 +02:00
Mads Kiilerich
bd3c252aab tests: HGRCPATH must be exported after assignment
- at least on Solaris
2011-06-25 01:55:13 +02:00
Idan Kamara
73a82e0b84 backout of a52e14fe37fb: allow to qpop/push with a dirty working copy
The new behavior was breaking existing tools that relied on a sequence such as
this:

1) start with a dirty working copy
2) qimport some patch
3) try to qpush it
4) old behavior would fail at this point due to outstanding changes.
   (new behavior would only fail if the outstanding changes and the patches
   changes intersect)
5) innocent user qrefreshes, gets his local changes in the imported patch

It's worth considering if we can move this behavior to -f in the future.
2011-06-24 23:25:42 +03:00
Adrian Buehlmann
1d541dffa3 revert: mention update in hint of abort when reverting to non-parent
and explicitly warn about uncommitted changes

Examples:

BEFORE:

    $ hg par -q
    7:e81a2efd53d4
    $ hg revert -r 2
    abort: no files or directories specified
    (use --all to discard all changes)

AFTER:

  Clean working directory (revert can be easily undone, no edits to be lost):

    $ hg revert -r 2
    abort: no files or directories specified
    (use --all to revert all files, or 'hg update 2' to update)

  Uncommitted changes (revert --all *does* discard edits and is pretty hard to
  undo or even impossible if --no-backup is specified):

    $ hg revert -r 2
    abort: no files or directories specified
    (uncommitted changes, use --all to discard all changes, or 'hg update 2' to update)
2011-06-24 12:37:29 +02:00
Augie Fackler
c679d5be7b progress: add a changedelay to prevent parallel topics from flapping (issue2698)
When combined with the earlier change to make the progress object
truly a singleton, this prevents the progress bar swapping on 'hg
clone --pull' on a local filesystem.

Thanks to timeless for lots of debugging help at the Copenhagen sprint
to isolate the root cause of this and a first draft an idea that would
fix it.
2011-06-23 15:00:45 -05:00
Mads Kiilerich
ed0023acf6 revset: fix aliases with 0 or more than 2 parameters
The existing code seemed to have incorrect assumptions about how parameter
lists are represented by the parser.

Now the match and replace functions have been merged and simplified by using
getlist().
2011-06-22 01:55:00 +02:00
Adrian Buehlmann
c1d402dc5f revert: be more helpful on uncommitted merges
BEFORE:
   $ hg revert
   abort: no files or directories specified
   (use --all to discard all changes)

 AFTER:
   $ hg revert
   abort: no files or directories specified
   (uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge)
2011-06-22 15:34:33 +02:00
Kevin Bullock
99e4d74da2 revert: be more explicit that changes are lost
BEFORE:
   $ hg revert
   abort: no files or directories specified
   (use --all to revert all files)

 AFTER:
   $ hg revert
   abort: no files or directories specified
   (use --all to discard all changes)
2011-06-20 22:15:52 -05:00
Peter Arrenbrecht
a276877b67 treediscovery: always return all remote heads
Old discovery only returned incoming heads, not all of them (for
changegroupsubset). New discovery must always return all of the remote heads
(for getbundle). I failed to properly adjust treediscovery in 43f4c1113c8d
when introducing setdiscovery.

The actual observable problem was 'remote: unsynced changes' when trying
to push a cset on one named branch to a server with a new cset on another
named branch. This scenario is now tested in test-treediscovery.t.
2011-06-20 14:11:01 +02:00