Commit Graph

17087 Commits

Author SHA1 Message Date
Adrian Buehlmann
c288410706 test-bisect: adapt for Windows 2012-06-15 01:02:44 +02:00
Adrian Buehlmann
6d187a37e0 test-journal-exists: use #if 2012-06-15 00:39:21 +02:00
Matt Mackall
8d0975d288 merge with stable 2012-06-14 15:13:16 -05:00
Angel Ezquerra
c386f40e4b revset: add "diff" field to "matching" keyword
The new "diff" field lets you use the matching revset keyword to find revisions
that apply the same change as the selected revisions.

The match must be exact (i.e. same additions, same deletions, same modified
lines and same change context, same file renames and copies).

Two revisions matching their diff must also match their files. Thus, to match
the diff much faster we will always check that the 'files' match first, and only
then check that the 'diff' matches as well.
2012-06-13 23:32:58 +02:00
Benjamin Pollack
8e9d7031f8 subrepo: support Git being named "git.cmd" on Windows (issue3173)
Popen does not consider "foo.cmd" equivalent to "foo" on Windows.
Unfortunately, the default MSYS Git installation installs only "git.cmd" into
the path by default.  This patch probes for both possible names on Windows.
2012-06-12 09:31:04 -04:00
Benjamin Pollack
b47c23a368 subrepo: warn user if Git is not version 1.6.0 or higher 2012-06-12 09:28:55 -04:00
Adrian Buehlmann
37d14413ec test-commit: remove extra cd ..
This specific cd .. leaves the base directory of the test ($TESTTMP).

Removing it avoids that test artifacts (e.g. files) are created
outside of the base directory.
2012-06-09 14:20:25 +02:00
Matt Harbison
79530484c8 mq: defer command wrapping to extsetup (API)
mq wraps all commands that are not in commands.norepo, which is now performed in
this second phase of the extensions setup process.  This goes against the
current best practices on the wiki [1] as far as where command wrapping is
performed, but follows it regarding where global options are injected.

mq needs to be the first layer called when command dispatching in order to
consistently retarget to the patch repo, regardless of the load order of the
extensions.  This means being the last to wrap the command table.  Previously,
'hg <extdiff> --mq' would diff the main repo unless mq was enabled after
extdiff.

[1] http://mercurial.selenic.com/wiki/WritingExtensions
2012-06-08 23:27:59 -04:00
Bryan O'Sullivan
513bd920fa revset: ensure we are reversing a list (issue3530) 2012-07-04 09:38:07 -07:00
Adrian Buehlmann
0375fd2e33 test-keyword: adapt for Windows 2012-07-03 18:02:07 +02:00
Mads Kiilerich
1f1159f6c1 tests: don't use dates before epoch in test-keyword.t
Timezone offsets of less than a minute is not shown but can cause displayed
dates to be before epoch start - and dates before epoch start is not shown
correctly on Windows (see also e68101a876a4).

These 'negative' dates could be considered undefined behaviour so we don't care
and swap the tests values for timestamp and timezone.
2012-07-04 02:04:58 +02:00
Mads Kiilerich
c5b3c2bb33 tests: make test-convert-bzr.t more stable
The test would occasionally fail because datesort don't have sub-second
granularity and thus can't sort commits made in the same second.

The test is made more stable by adding 1 second of sleep to make sure the bzr
commits are done with different timestamps.
2012-07-04 01:45:28 +02:00
Joshua Redstone
07547a08a2 casecollision: add tests
Add more tests to exercise the case collion detection code
2012-06-27 12:37:01 -07:00
Joshua Redstone
5d6b6b4a44 dirstate: add dir/file collision test
Add a test exercising collisions in add between files and directories of the
same name.
2012-06-27 12:28:26 -07:00
Joshua Redstone
bb82354578 dirstate: factor common update code into _addpath
Factor update code common to all callers of _addpath into _addpath.
By centralizing the update code here, it provides one place to put
updates to new data structures - in a future patch.  It also removes
a few lines of duplicate code.
2012-06-18 08:06:42 -07:00
Adrian Buehlmann
d0ed8e9722 test-subrepo-relative-path: partially adapt for Windows 2012-07-02 16:54:01 +02:00
Mads Kiilerich
e3835ef5ff tests: make rm of usercache in test-largefiles.t more robust
Recursive removal of a different path could be fatal - better avoid recursive
rm completely.
2012-07-03 01:49:51 +02:00
Matt Mackall
f52103b924 merge with stable 2012-07-01 21:20:30 -05:00
Matt Mackall
12d4bcf86f merge with crew 2012-07-01 21:19:57 -05:00
Mads Kiilerich
0585ab3757 tests: enable test-largefiles.t on Windows MSYS
The 'serve' requirement is moved to the sections that really need it.

$USERCACHE needs quoting.
2012-07-02 01:48:12 +02:00
Adrian Buehlmann
4c34d29e62 test-largefiles: partially adapt for Windows
The adaption is partial, because "serve" is not yet officially supported in
tests on Windows.

The test passes on Windows with an experimental testbed that supports
hg serve in tests on Windows - except for some USERCACHE issues.

The added (glob)'s are needed because of backslash <-> shlash issues in paths.
2012-06-30 19:31:03 +02:00
Mads Kiilerich
e1e9922b2d tests: make histedit pass on Windows MSYS
The command file will now be named with $TESTTMP (with '\') instead of `pwd`
(with '/') to avoid wrong path conversions.
2012-07-02 01:47:59 +02:00
Mads Kiilerich
9fd035159b tests: make histedit tests more resilient to filesystem variation
Better quoting of odd filesystem paths and no dependency to execute bit.
2012-06-30 03:34:50 +02:00
Mads Kiilerich
db710d2031 tests: convert histedit tests to .t
Mostly a trivial conversion.
2012-06-30 03:34:44 +02:00
Mads Kiilerich
7c32277ff3 histedit: use stable iteration order for processing bookmarks
Random dict iteration order caused test failure in
test-histedit-bookmark-motion.t.
2012-06-30 03:34:41 +02:00
Matt Mackall
cb4824284b merge with stable 2012-06-06 21:17:33 -05:00
Matt Mackall
af2bb57f5a merge with i18n 2012-06-06 21:17:20 -05:00
Pierre-Yves.David@ens-lyon.org
3c02b8eab1 obsolete: function and method to access some obsolete data
An `obsolete` boolean property is added to changeset context. Function to get
obsolete marker object from a changeset context are added to the obsolete
module.
2012-06-06 01:56:58 +02:00
Pierre-Yves.David@ens-lyon.org
d60eedc2d6 obsolete: exchange obsolete marker over pushkey
For a version of the exchange, all markers are exchange. This won't
scale and we will need a better protocol later.
2012-06-07 19:21:59 +02:00
Pierre-Yves.David@ens-lyon.org
715c9d5f3e debugobsolete: list all obsolete marker if no argument are specified 2012-06-07 19:20:44 +02:00
Adrian Buehlmann
519e4c0d6f test-add: enable for Windows 2012-06-05 22:46:14 +02:00
Adrian Buehlmann
dc41c6e820 test-addremove: remove bits about con.xml
Windows reserved filename warnings are already enough tested in test-add.t.
This enables the test for Windows.
2012-06-05 23:13:45 +02:00
Bryan O'Sullivan
1de6d211c8 util: simplify queue management in chunkbuffer
This also fixes a small wire protocol performance regression.
2012-06-05 16:52:20 -07:00
Kevin Bullock
926372b575 update: fix help regarding update to ancestor
As pointed out on the user mailing list, hg will update just as happily
to an ancestor if there are uncommitted changes as to a descendant.
2012-06-05 13:33:52 -05:00
Jim Hague
1b46810a77 bugzilla: stop bugs always being marked as fixed in xmlrpc (issue3484)
Bugs should only be marked fixed if the comment parser gives them the
fixed state. xmlrpc+email got this right, xmlrpc screwed it up.
2012-06-06 16:44:17 +01:00
Wagner Bruna
bead143dc2 merge with i18n 2012-06-05 10:09:17 -03:00
Alexander Sauta
f41df0a97b i18n-ru: synchronized with 85940498c8b0 2012-06-05 07:57:04 +01:00
Matt Mackall
49a9d0006f help: drop -a from heads syntax summary (issue3483) 2012-06-04 17:22:09 -05:00
Idan Kamara
897b2d782b graft: restore config option on correct ui 2012-06-04 15:43:16 +03:00
wujek srujek
a4762c56c6 hgweb: fixes linebreak location in gitweb filediff.tmpl view
It is consistent with other templates now and doesn't cause the help link to
(incorrectly) appear on the next line.
2012-06-04 18:03:23 +02:00
Pierre-Yves.David@ens-lyon.org
1cc1e699cb obsolete: add easy way to iterate over obsolete marker object 2012-06-04 00:50:19 +02:00
Pierre-Yves.David@ens-lyon.org
3659d103ff obsolete: helper class to access obsolete marker data 2012-06-07 19:19:58 +02:00
Pierre-Yves.David@ens-lyon.org
0d5addf62d command: creation of obsolete marker
* add metadata encoding/decoding ability

* add a method to obsstore to help creating marker

* add a debug command to create marker
2012-06-07 19:15:23 +02:00
Pierre-Yves.David@ens-lyon.org
f9dd15112c obsolete: introduction of obsolete markers
Markers are stored as binary records in a log structured file in
.hg/store/obsstore.
2012-06-07 19:07:39 +02:00
Matt Mackall
0fcdc937c2 Added signature for changeset a1e1826de33a 2012-06-01 23:48:27 -05:00
Matt Mackall
f6aed3cb78 merge with i18n 2012-06-01 15:14:13 -05:00
Bryan O'Sullivan
ca79cf4afa scmutil: seen.union should be seen.update (issue3476) 2012-05-31 20:55:30 -07:00
Patrick Mezard
5315858d38 patch: keep patching after missing copy source (issue3480)
When applying a patch renaming/copying 'a' to 'b' on a revision where
'a' does not exist, the patching process would abort immediately,
without processing the remaining hunks and without reporting it. This
patch makes the patching no longer abort and possible hunks applied on
the copied/renamed file be written in reject files.
2012-06-01 17:37:56 +02:00
Wagner Bruna
91fd22d273 i18n-pt_BR: synchronized with 9afcfbca1710 2012-05-31 21:47:40 -03:00
Elifarley Callado Coelho Cruz
6010752603 acl: user docs for the "!" prefix in user or group names 2012-05-30 21:47:51 -03:00