Commit Graph

2097 Commits

Author SHA1 Message Date
Matt Mackall
5871cdf2c8 audit: be even pickier (issue1450) 2009-03-04 17:02:16 -06:00
Alex Unden
eb753f04dc bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set 2009-02-27 02:01:45 -08:00
David Soria Parra
f6ec2e9b01 bookmarks: Set current bookmark if we create a new one on the tip
If track.current is enabled we set the newly created bookmark as the
current tracked bookmark. We do not do this if a revision is specified.
2009-03-01 00:30:01 +01:00
Matt Mackall
6ed04dc163 convert: change hg.saverev default to False
This needlessly breaks changeset identifiers for the common case (cleaning
history), which is sad.
2009-03-02 19:19:12 -06:00
Matt Mackall
104cda5c20 tag: force load of tag cache 2009-03-02 19:19:09 -06:00
Mads Kiilerich
2694fdc1a4 run-tests.py: avoid using popen2.Popen4 - use subprocess instead
Use subprocess to emulate Popen4 if available - similar to how it is done in
util.py.

Using popen2 under python 2.6 gives
DeprecationWarning: The popen2 module is deprecated.  Use the subprocess module.
2009-02-27 19:10:38 +01:00
Mads Kiilerich
9686279212 test-convert-cvs*: mute output from "cvs up"
Apparently some versions of cvs outputs more than other versions. That is
however not relevant for these tests.
2009-02-27 17:52:31 +01:00
timeless
26d95caa99 help: miscellaneous language fixes 2009-02-28 12:38:45 +01:00
Frank Wierzbicki
975c4301af tests: use same popen strategy for jython as for nt 2009-02-18 13:19:30 +01:00
Matt Mackall
cb4d50ff04 Introduce HG_PREPEND to solve pretxn races
- add writepending to flush delayed writes to separate file
- add support in hooks for lazy evaluation of callable parameters
- add HG_PENDING to pretxn hooks
  - call writepending if hook is used
  - pass repo root to hook environment
- if HG_PENDING = repo root, we're in pretxn hook
  - read pending data to make pending changesets visible
- filter HG_PENDING in tests/printenv.py
2009-02-16 19:35:07 -06:00
Stefano Tortarolo
ae208b3a98 rebase: pull --rebase updates if there is nothing to rebase 2009-01-18 19:59:51 +01:00
Mads Kiilerich
d6ab2f95b5 test-merge-tool: Make sure no hgmerge can be found in $PATH
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
2009-02-10 22:47:38 +01:00
Matt Mackall
2e1730294c patch: teach selectfile about symlinks (issue1438) 2009-02-16 17:37:23 -06:00
Matt Mackall
1a2d87e4e1 mq: handle empty patches more gracefully (issue1501) 2009-02-16 17:37:23 -06:00
Simon Heimberg
23251d5bdf test suite: saver check if bzr is installed
Test if bzrlib.__doc__ is not empty. Ignores an empty lib.
2009-02-08 13:46:04 +01:00
Augie Fackler
7131a2f8b7 fancyopts: Parse options that occur after arguments.
This changes the behavior of qguard in the case of setting negative guards, as -- will now always be required.
Fixes issue1402.
Doc fixes for mq by mpm.
2009-02-10 13:26:00 -06:00
Augie Fackler
0dd0e4f46d tests: Add a test for the behavior of 'hg export -- -2' 2009-02-10 16:31:52 -06:00
Mads Kiilerich
9b111ad022 test-merge-tools: Don't use tac
"tac" was a bad tool - is not available on all platforms.

The test now only uses the "tools" true, false, head, echo, cat and /bin/cat
2009-02-10 16:11:48 +01:00
Matt Mackall
d7c2a2e49b merge: mark kept local files as readded on linear update (issue539) 2009-02-15 10:50:48 -06:00
Jim Correia
78e5b53d7d add --git option to commands supporting --patch (log, incoming, history, tip)
No short -g form, since it would conflict with -g from the graphlog extension.
2009-02-14 22:40:39 +01:00
Dirkjan Ochtman
29fd92e139 tests: fix for test-identify returning 255 2009-02-13 13:52:34 +01:00
Gilles Moris
60d2f6f240 extdiff: add --change option to display single changeset diff
This is the counterpart for extdiff of 44ccab2b73f0.
2009-02-07 19:41:05 +01:00
Dirkjan Ochtman
73563fa8ff identify: have consistent output for local repositories
Also, add some extensive testing for it (hardly any in the suite so far).
2009-02-13 11:32:33 +01:00
Martin Geisler
8d98ac17bc reset mergestate after commit 2008-12-25 10:42:01 +01:00
Mads Kiilerich
d775f5aa2a Make util.find_exe alway returns existing file, fixing issue1459
It seems like the old behaviour with different handling for commands with and
without path was intended, but I think this behaviour of util.find_exe is
better:
* Always returns existing file
* or None if command not found - no default
* Windows: Returned file thus always ends with extension from PATHEXT

This fixes http://www.selenic.com/mercurial/bts/issue1459. The change might
fix other unintended behaviour too.
2009-01-25 21:20:13 +01:00
Mads Kiilerich
ec83cadc8e test-merge-tools
Some tests of merge-tools configuration and selection, mostly excercising
filemerge.py
2009-01-25 21:20:11 +01:00
Jim Correia
652c76f46a Account for symlinks when setting up HGTMP.
On Mac OS X, several top-level directories are actually symlinks into
/private. When setting up HGTMP, expand the symlinks so that later
comparisons to or substituations with the actual path work as expected.
2009-01-25 14:12:41 -05:00
Benoit Allard
c429e1d8f6 coal/paper: switch to XHTML 1.1 2009-02-05 18:15:33 +01:00
Martin Geisler
8fdb89c045 run-tests: add --pure flag for using pure Python modules 2009-01-31 22:50:18 +01:00
Benoit Boissinot
51f22b2a1b merge with crew 2009-01-27 18:17:59 +01:00
Steve Borho
4860997ffa record: do not lose permission changes on commit 2009-01-27 09:58:48 -06:00
Dirkjan Ochtman
e5623f9c50 graphlog: some testing for incoming and outgoing graphs 2009-01-26 16:34:38 +01:00
Matt Mackall
e0882a579f fix up tests for paths and urls help 2009-01-25 12:07:41 -06:00
Patrick Mezard
1977ae7dbb Merge with crew-stable 2009-01-25 18:58:12 +01:00
Patrick Mezard
56a4e737a8 Fix a corner case when committing a rename after a merge (issue1476) 2009-01-25 18:55:29 +01:00
Dirkjan Ochtman
4e4940dc82 templater: fix age filter to state the obvious on future timestamps 2009-01-22 16:07:44 +01:00
Dirkjan Ochtman
2976fb29b0 tests: fix issue in test-audit-path with HGTMP on OS X 2009-01-22 15:22:37 +01:00
Dirkjan Ochtman
ed55287ff1 tests: eliminate use of sed -i (which fails on NetBSD) 2009-01-22 14:33:49 +01:00
Dirkjan Ochtman
44cb61f1a6 tests: fix up tests to cope with 8d681e04a351 2009-01-22 14:32:39 +01:00
Dirkjan Ochtman
c4b462d161 merge with crew-stable 2009-01-19 12:58:01 +01:00
Stepan Koltsov
1fa2450a68 coal/paper: add missing spaces in changeset child formatting 2009-01-19 12:36:06 +01:00
Christian Ebert
5afb33fd34 notify: fix neglect of custom headers set via template
0366830cd960 introduced a bug that discarded all custom headers.
Add custom header to test template.
2009-01-15 01:38:52 +01:00
Patrick Mezard
a70c4ebc9d merge: fix execute bit update issue introduced by db8aabe14ff1 2009-01-13 22:41:06 +01:00
Patrick Mezard
7ab8b3fde9 diffstat: don't fail on merges
First version by Alexander Solovyov <piranha@piranha.org.ua>
2009-01-13 20:28:06 +02:00
Christian Ebert
4f717b637b notify: fix neglect of custom headers set via template
0366830cd960 introduced a bug that discarded all custom headers.
Add custom header to test template.
2009-01-15 01:38:52 +01:00
John Mulligan
5d89493a96 branch closing: add test for branch closing (and reopening) 2009-01-14 21:47:38 -05:00
John Mulligan
9e580fc6f7 store all heads of a branch in the branch cache
All heads of branches will be stored in a new cache file 'branchheads.cache'
within the .hg directory. The old 'branch.cache' file from older versions
will be ignored.

The new cache contents are formatted line-by-line as '{node} {branchtag}\n'.
This is the same as the previous format. Now, every head is recorded in
an oldest -> tipmost order.

The localrepo.branchheads function is reworked to use the data from the cache.
2009-01-14 21:47:38 -05:00
Bernhard Leiner
bf4052120f mq: make qnew patch format consistent with qrefresh (issue1457) 2009-01-12 09:12:35 +01:00
Matt Mackall
356502607f refactor version code
- simplify version detection code
- move detection code into setup.py
- move version reading function into util.py
- drop version.py code

This makes hg more closely follow its own recommendation of how to deal with
versioning your builds: use hg id in your build script.
2009-01-10 18:02:38 -06:00
Patrick Mezard
6aa7cd6f84 Merge with crew-stable 2009-01-13 23:17:19 +01:00