Commit Graph

4392 Commits

Author SHA1 Message Date
Augie Fackler
c62bb34caf run-tests.py: correctly handle list options with parallel tasks 2011-05-04 10:39:10 -05:00
Idan Kamara
64876670a4 mq: don't suggest to refresh when qpushing with no applied patches 2011-05-04 23:12:23 +03:00
Kevin Bullock
c38d0cc58b bookmarks: allow deactivating current bookmark with -i 2011-05-04 10:43:47 -05:00
Kevin Bullock
b95625191f bookmarks: allow to create/move bookmark without making it current (issue2788)
Adds a -i/--inactive flag to the bookmarks command to create or move a
bookmark without making it the current one. This lets you use a bookmark
like a shareable, movable 'tag' and less like a 'branch'.

Thanks to Alexander Solovyov <alexander@solovyov.net> for most of the
work of implementation, and Matt Mackall <mpm@selenic.com> for
suggesting the option name.
2010-12-11 18:08:55 +01:00
Mads Kiilerich
078bcf3f4c tests: test subrepos with ssh urls 2011-05-05 01:57:13 +02:00
Mads Kiilerich
adf83aa0ff tests: share dummyssh 2011-05-05 01:47:46 +02:00
Mads Kiilerich
d0fd430b35 tests: fix test-ssh.t after c77f1a86a050 2011-05-05 01:47:46 +02:00
Matt Mackall
c89ad76e08 merge with crew 2011-05-04 08:21:50 -05:00
Sune Foldager
c8ff620c56 tests: fix deprecated use of hg debugdata/debugindex
For filelogs, debugindex and debugdata can be called with the file name
directly instead of the path to the revlog. Since in the future filelogs
will no longer be valid revlogs, calling with a path to the revlog is
deprecated for debugdata. For debugindex it is expected to still work,
but I changed them as well for consistency.
2011-05-04 13:37:41 +02:00
Matt Mackall
bf126992e1 merge with stable 2011-05-03 22:04:23 -05:00
Matt Mackall
828f7480ea merge with crew 2011-05-03 22:04:11 -05:00
Sune Foldager
73c8696ab4 ui: add configint function and tests 2011-05-03 22:28:08 +02:00
Adrian Buehlmann
9bd981250a test-casecollision.t: add test for case changing rename 2011-05-03 22:11:56 +02:00
Kevin Bullock
a19d7654b7 mq: strip extra whitespace from node ids in header (issue2790)
This makes `hg qpush --exact` work with patches created by `hg export`.
2011-05-03 11:46:02 -05:00
Mads Kiilerich
ec46d5bf4d backout a3900c75ca8c - the "unreachable code" was apparently not unreachable
All tests repeatedly passes with a3900c75ca8c on some machines, but on other
machines it regularly causes failure in test-mv-cp-st-diff.t, such as:

@@ -203,6 +203,7 @@

   - working to root: --rev 0
   M a
+  M x/x
   A b
     a
2011-05-01 19:51:28 +02:00
Sune Foldager
f3630ec41e merge with mpm 2011-05-01 19:44:28 +02:00
timeless
1760e54c82 test: add pyflakes checking for unable to detect undefined names 2011-05-01 17:36:16 +02:00
Mads Kiilerich
6cadc46456 revset: avoid over-aggresive optimizations of non-filtering functions (issue2549)
When limit, last, min and max were evaluated they worked on a reduced set in the
wrong way. Now they work on an unrestricted set (the whole repo) and get
limited later on.
2011-05-01 17:35:05 +02:00
Mads Kiilerich
32994f27cc convert: handle invalid subversion source paths 2011-05-01 17:35:05 +02:00
Mads Kiilerich
6688bea829 convert: also catch missing revlogs when introduced in repo roots
The previous behaviour was almost as if convert.hg.ignoreerrors was always set
for revisions without parents, except that errors were silently ignored. Revlog
errors are handled as a side effect of getcopies(), but getcopies() was only
called when convert.hg.ignoreerrors was set.

Now we always call self.getcopies for root revisions, not only when
convert.hg.ignoreerrors is set, just like we do on all other revisions.
The extra call might be a bit expensive, but the proper fix for that would be
to catch these errors in another way.
2011-05-01 17:34:16 +02:00
timeless
8351ef925f tests: add pyflakes checking for assigned to but never used 2011-05-01 17:27:41 +02:00
timeless
1e24d74cfd test-pyflake: improve sorting algorithm 2011-05-01 18:56:27 +02:00
Dan Villiom Podlaski Christiansen
511c941422 prevent transient leaks of file handle by using new helper functions
These leaks may occur in environments that don't employ a reference
counting GC, i.e. PyPy.

This implies:
 - changing opener(...).read() calls to opener.read(...)
 - changing opener(...).write() calls to opener.write(...)
 - changing open(...).read(...) to util.readfile(...)
 - changing open(...).write(...) to util.writefile(...)
2011-05-02 10:11:18 +02:00
Benoit Boissinot
c5f5260aea bundler: make parsechunk return the base revision of the delta 2011-04-30 10:00:41 +02:00
timeless
75e43f8a4b tests: add pyflakes checking for unused imports 2011-05-01 15:22:30 +02:00
Augie Fackler
3d09b5a236 run-tests: add flag to provide extra hgrc options for test runs 2011-05-01 08:00:25 -05:00
Patrick Mezard
ebc1f0434a graphlog: always sort revisions topologically
The grapher cannot really handled revisions if they are not emitted in
topological order. The previous 'reverse()' revset was not enough to achieve
that and was replaced by an explicit sort call for simplicity. The --limit
option is now also handled as usual with cmdutil.loglimit() instead of a
'limit' revset.
2011-05-01 15:51:52 +02:00
Patrick Mezard
399c49e7c9 graphlog: take the union of --rev specs instead of the intersection 2011-05-01 15:51:48 +02:00
Patrick Mezard
6386b88096 graphmod: correctly emit nodes with more than 2 predecessors
The grandparent() function was returning only the closest predecessor of a
missing parent while it must return all of them to display a correct ancestry
graph.
2011-05-01 15:51:46 +02:00
Matt Mackall
77a126fc95 merge with nicdumz 2011-05-01 06:04:08 -05:00
Brodie Rao
92f1644187 pushkey: add hooks for pushkey/listkeys 2011-05-01 11:12:36 +02:00
Nicolas Dumazet
c45338f8d5 tests: export patches only once in test-impexp-branch 2011-05-01 10:51:10 +02:00
Augie Fackler
f360f9d092 test-patchbomb.t: clean up progress tests 2011-04-30 12:02:09 -05:00
Nicolas Dumazet
98949c2559 tests: do not export several times the same patch/diff in test-import 2011-04-30 18:31:28 +02:00
Alexander Solovyov
2f6ab6bf04 revset aliases 2011-04-30 18:30:14 +02:00
Matt Mackall
89ec131e91 http: minor tweaks to long arg handling
x-arg -> x-hgarg
replace itertools.count(1)
2011-05-01 03:51:04 -05:00
Steven Brown
c1075f3880 httprepo: long arguments support (issue2126)
Send the command arguments in the HTTP headers. The command is still part
of the URL. If the server does not have the 'httpheader' capability, the
client will send the command arguments in the URL as it did previously.

Web servers typically allow more data to be placed within the headers than
in the URL, so this approach will:
- Avoid HTTP errors due to using a URL that is too large.
- Allow Mercurial to implement a more efficient wire protocol.

An alternate approach is to send the arguments as part of the request body.
This approach has been rejected because it requires the use of POST
requests, so it would break any existing configuration that relies on the
request type for authentication or caching.

Extensibility:
- The header size is provided by the server, which makes it possible to
  introduce an hgrc setting for it.
- The client ignores the capability value after the first comma, which
  allows more information to be included in the future.
2011-05-01 01:04:37 +08:00
Nicolas Dumazet
13a26e7035 tests: move rebase-keep-branch into rebase-named-branches
It's not worth building a repository just to test keep branch
when we can do it our bigger, other, already built repositories.
2011-04-30 17:38:06 +02:00
Nicolas Dumazet
f349f5b9c5 tests: move testcase from rebase-named-branches to rebase-parameters
It saves us a clone of a repository.
2011-04-30 17:38:06 +02:00
Nicolas Dumazet
fc02c73f8c tests: change test-rebase-parameters to use bundle/rebase.hg 2011-04-30 17:38:06 +02:00
Nicolas Dumazet
cd356ed0bf tests: change test-rebase-detach to use bundle/rebase.hg 2011-04-30 17:38:06 +02:00
Nicolas Dumazet
53cb06c83f tests: simplify test-rebase-named-branches
We were cloning a repo to perform a smoke test that could
have been performed earlier.
2011-04-30 17:38:06 +02:00
Nicolas Dumazet
9a74500329 tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Add two changesets to the scenario so that the bundle can be reused
within three tests.

Before:
  @  5: 'F'
  |
  | o  4: 'E'
  |/|
  o |  3: 'D
  | |
  | o  2: 'C'
  |/
  | o  1: 'B'
  |/
  o  0: 'A'

After:
  @  7: 'H'
  |
  | o  6: 'G'
  |/|
  o |  5: 'F'
  | |
  | o  4: 'E'
  |/
  | o  3: 'D'
  | |
  | o  2: 'C'
  | |
  | o  1: 'B'
  |/
  o  0: 'A'

Revisions 0-1 keep the same number/label. Others were translated by
an offset of 2 (2.C -> 4.E)
2011-04-30 17:38:06 +02:00
Nicolas Dumazet
1dd586b3dd tests: introduce a rebase bundle to use with rebase tests
Allows saving a few seconds in test runs by not constructing
over and over the same repository.
2011-04-30 17:38:06 +02:00
Nicolas Dumazet
be93b69b75 tests: create a bundle to bootstrap tests using a remote repository
It should be faster to use a single common bundle instead of
recreating 4 times the same repository manually.
2011-04-30 17:38:06 +02:00
Nicolas Dumazet
274ada7d8c tests: move test bundles in a bundles/ subdirectory 2011-04-30 17:38:06 +02:00
Nicolas Dumazet
561d5dd9fb tests: move test-issue436 in test-dispatch where fancyopts is tested 2011-04-30 17:38:06 +02:00
Nicolas Dumazet
b847a60638 tests: remove test-issue433 as it's covered by test-parents 2011-04-30 17:38:06 +02:00
Nicolas Dumazet
a2d3866adb tests: remove executable bits from unified tests
Those files are not executable.
2011-04-30 17:38:06 +02:00
Nicolas Dumazet
9d38dd1944 tests: remove test-issue322 as it's fully included in test-issue660 2011-04-30 17:38:06 +02:00